Merge branch 'master' into visitor

Conflicts:
	src/mainwin.cc

1 files changed, 8 insertions, 6 deletions

diff --git a/src/mainwin.cc b/src/mainwin.cc
index fab0c74..89d17c5 100644
--- a/src/mainwin.cc
+++ b/src/mainwin.cc
@@ -1114,16 +1114,18 @@ void MainWindow::actionReloadCompile()
 	compile(true);
 	if (this->root_node) compileCSG(true);
 
+	// Go to non-CGAL view mode
+	if (viewActionThrownTogether->isChecked()) {
+		viewModeThrownTogether();
+	}
+	else {
 #ifdef ENABLE_OPENCSG
-	if (!(viewActionOpenCSG->isVisible() && viewActionOpenCSG->isChecked()) &&
-			!viewActionThrownTogether->isChecked()) {
 		viewModeOpenCSG();
-	}
-	else
+#else
+		viewModeThrownTogether();
 #endif
-	{
-		this->glview->updateGL();
 	}
+
 	clearCurrentOutput();
 }