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/GLView.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/GLView.h')
| -rw-r--r-- | src/GLView.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/GLView.h b/src/GLView.h index 39ec0a6..f7ae5a7 100644 --- a/src/GLView.h +++ b/src/GLView.h @@ -54,6 +54,7 @@ public: bool showaxes; bool showfaces; bool showedges; + bool showcrosshairs; Eigen::Vector3d object_trans; Eigen::Vector3d object_rot; Eigen::Vector3d camera_eye; @@ -61,6 +62,11 @@ public: #ifdef ENABLE_OPENCSG GLint shaderinfo[11]; + bool is_opencsg_capable; + bool has_shaders; +// void enable_opencsg_shaders(); + bool opencsg_support; + int opencsg_id; #endif /* void paintGL(); // |