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.cc | |
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.cc')
-rw-r--r-- | src/qglview.cc | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/src/qglview.cc b/src/qglview.cc index 0e07b52..8e228e4 100644 --- a/src/qglview.cc +++ b/src/qglview.cc @@ -71,31 +71,12 @@ static bool running_under_wine = false; void QGLView::init() { - this->viewer_distance = 500; this->object_rot << 35, 0, -25; - this->object_trans << 0, 0, 0; this->mouse_drag_active = false; - - this->showedges = false; - this->showfaces = true; - this->orthomode = false; - this->showaxes = false; - this->showcrosshairs = false; - - for (int i = 0; i < 10; i++) - this->shaderinfo[i] = 0; - this->statusLabel = NULL; setMouseTracking(true); -#ifdef ENABLE_OPENCSG - this->is_opencsg_capable = false; - this->has_shaders = false; - this->opencsg_support = true; - static int sId = 0; - this->opencsg_id = sId++; -#endif // see paintGL() + issue160 + wine FAQ #ifdef _WIN32 |