Merge remote-tracking branch 'origin/master' into csgterm-refactor

opengl.pri

@@ -11,11 +11,12 @@ using_qopenglwidget {
 else {
   message("Using QGLWidget")
   QT += opengl
-  # see http://fedoraproject.org/wiki/UnderstandingDSOLinkChange
-  # and https://github.com/openscad/openscad/pull/119
-  # ( QT += opengl does not automatically link glu on some DSO systems. )
-  unix:!macx {
-    QMAKE_LIBS_OPENGL *= -lGLU
-    QMAKE_LIBS_OPENGL *= -lX11
-  }
+}
+
+# see http://fedoraproject.org/wiki/UnderstandingDSOLinkChange
+# and https://github.com/openscad/openscad/pull/119
+# ( QT += opengl does not automatically link glu on some DSO systems. )
+unix:!macx {
+  QMAKE_LIBS_OPENGL *= -lGLU
+  QMAKE_LIBS_OPENGL *= -lX11
 }

openscad.pro

@@ -116,7 +116,7 @@ mingw* {
 }
 
 CONFIG += qt
-QT += concurrent
+QT += widgets concurrent
 
 netbsd* {
    QMAKE_LFLAGS += -L/usr/X11R7/lib

src/QGLView.cc

@@ -201,7 +201,12 @@ void QGLView::mouseDoubleClickEvent (QMouseEvent *event) {
 	double y = viewport[3] - event->pos().y() * this->getDPI();
 	GLfloat z = 0;
 
+	glGetError(); // clear error state so we don't pick up previous errors
 	glReadPixels(x, y, 1, 1, GL_DEPTH_COMPONENT, GL_FLOAT, &z);
+	GLenum glError = glGetError();
+	if (glError != GL_NO_ERROR) {
+		return;
+	}
 
 	if (z == 1) return; // outside object
 

src/localscope.cc

@@ -42,7 +42,6 @@ std::string LocalScope::dump(const std::string &indent) const
 	return dump.str();
 }
 
-// FIXME: Two parameters here is a hack. Rather have separate types of scopes, or check the type of the first parameter. Note const vs. non-const
 std::vector<AbstractNode*> LocalScope::instantiateChildren(const Context *evalctx) const
 {
 	std::vector<AbstractNode*> childnodes;