diff options
| author | don bright <hugh.m.bright@gmail.com> | 2013-02-24 03:54:53 (GMT) |
|---|---|---|
| committer | don bright <hugh.m.bright@gmail.com> | 2013-02-24 03:54:53 (GMT) |
| commit | ca41979ee514f642c506e4f4d81461f19b587bf2 (patch) | |
| tree | f31feb004d0b724d5240c8a227c7f0c886939a1b /src/QGLView.h | |
| parent | eff16283358217b43b310269a72e0cb47357a8b3 (diff) | |
| parent | abc9da96c89b337377ee62ac29ee54e4e7b0a514 (diff) | |
Merge branch 'master' of github.com:openscad/openscad into issue11_2
Conflicts:
RELEASE_NOTES
openscad.pro
src/mainwin.cc
Diffstat (limited to 'src/QGLView.h')
| -rw-r--r-- | src/QGLView.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/QGLView.h b/src/QGLView.h index 77c5baf..5cb1872 100644 --- a/src/QGLView.h +++ b/src/QGLView.h @@ -43,11 +43,6 @@ public: public: QLabel *statusLabel; -#ifdef ENABLE_OPENCSG - bool opencsg_support; - int opencsg_id; -#endif - private: void init(); @@ -71,8 +66,6 @@ private: void normalizeAngle(GLdouble& angle); #ifdef ENABLE_OPENCSG - bool is_opencsg_capable; - bool has_shaders; private slots: void display_opencsg_warning(); #endif |