merge

Merge remote branch 'upstream/visitor' into visitortests

Conflicts:
	src/export.cc
	src/openscad.cc
	src/polyset.cc
	src/transform.cc
	tests/CMakeLists.txt
	tests/FindGLEW.cmake
	tests/csgtermtest.cc

1 files changed, 20 insertions, 0 deletions

diff --git a/src/CGALRenderer.h b/src/CGALRenderer.h
new file mode 100644
index 0000000..5f854ea
--- /dev/null
+++ b/src/CGALRenderer.h
@@ -0,0 +1,20 @@
+#ifndef CGALRENDERER_H_
+#define CGALRENDERER_H_
+
+#include "renderer.h"
+#include "CGAL_Nef_polyhedron.h"
+
+class CGALRenderer : public Renderer
+{
+public:
+	CGALRenderer(const CGAL_Nef_polyhedron &root);
+	~CGALRenderer();
+	void draw(bool showfaces, bool showedges) const;
+
+public:
+	const CGAL_Nef_polyhedron &root;
+	class Polyhedron *polyhedron;
+	class PolySet *polyset;
+};
+
+#endif