Merge branch 'master' into visitor

Conflicts:
	src/GLView.h
	src/glview.cc
	src/mainwin.cc
	src/render-opencsg.cc

1 files changed, 5 insertions, 4 deletions

diff --git a/src/MainWindow.h b/src/MainWindow.h
index a44644a..0745935 100644
--- a/src/MainWindow.h
+++ b/src/MainWindow.h
@@ -41,17 +41,18 @@ public:
 	class CSGChain *root_chain;
 #ifdef ENABLE_CGAL
 	class CGAL_Nef_polyhedron *root_N;
-	bool recreate_cgal_ogl_p;
-	void *cgal_ogl_p;
-	PolySet *cgal_ogl_ps;
+	class CGALRenderer *cgalRenderer;
 #endif
+#ifdef ENABLE_OPENCSG
+	class OpenCSGRenderer *opencsgRenderer;
+#endif
+	class ThrownTogetherRenderer *thrownTogetherRenderer;
 
 	std::vector<CSGTerm*> highlight_terms;
 	CSGChain *highlights_chain;
 	std::vector<CSGTerm*> background_terms;
 	CSGChain *background_chain;
 	QString last_compiled_doc;
-	bool enableOpenCSG;
 
 	static const int maxRecentFiles = 10;
 	QAction *actionRecentFile[maxRecentFiles];