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

4 files changed, 27 insertions, 0 deletions

diff --git a/testdata/scad/bugs/gridbug.scad b/testdata/scad/bugs/gridbug.scad
new file mode 100644
index 0000000..678a22a
--- /dev/null
+++ b/testdata/scad/bugs/gridbug.scad
@@ -0,0 +1,9 @@
+// This crashes OpenSCAD including 2011.06 in PolyReducer due to two vertices of 
+// a triangle evaluating to the same index
+linear_extrude(height=2) 
+  polygon(points=[[0, 0],
+		  [1, 0],
+		  [1.0014, 1],
+		  [1, 1],
+		  [0, 1]], 
+           paths=[[0,1,2,3,4]]);
diff --git a/testdata/scad/bugs/horn-torus.scad b/testdata/scad/bugs/horn-torus.scad
new file mode 100644
index 0000000..f93a364
--- /dev/null
+++ b/testdata/scad/bugs/horn-torus.scad
@@ -0,0 +1,5 @@
+// This model causes a CGAL assertion in CGAL_Nef_polyhedron3(CGAL_Polyhedron) constructor.
+// One cause of this error could be that the grid handling in PolySet degenerated the original
+// mesh into a non-manifold one.
+
+rotate_extrude($fn = 24) translate ([ 1, 0, 0 ]) circle (r = 1);
diff --git a/testdata/scad/bugs/minkowski-assert.scad b/testdata/scad/bugs/minkowski-assert.scad
new file mode 100644
index 0000000..4ae81da
--- /dev/null
+++ b/testdata/scad/bugs/minkowski-assert.scad
@@ -0,0 +1,8 @@
+minkowski() {
+ cube(20, center=true);
+ rotate([20, 30, 40])
+   difference() {
+     cube(5, center=true);
+     cube([1, 1, 10], center=true);
+   }
+}
diff --git a/testdata/scad/bugs/polygon-touch.scad b/testdata/scad/bugs/polygon-touch.scad
new file mode 100644
index 0000000..afa2938
--- /dev/null
+++ b/testdata/scad/bugs/polygon-touch.scad
@@ -0,0 +1,5 @@
+# Somehow the 2D union/tessellation algorithm doesn't support touching polygons
+# Changing translate([-10,-10,0]) to translate([-9.99,-9.99,0]) works
+
+square([10,10]);
+translate([-10,-10,0]) square([10,10]);