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, 30 insertions, 0 deletions

diff --git a/testdata/scad/features/hull2-tests.scad b/testdata/scad/features/hull2-tests.scad
new file mode 100644
index 0000000..3bea3c5
--- /dev/null
+++ b/testdata/scad/features/hull2-tests.scad
@@ -0,0 +1,30 @@
+module convex2dSimple() {
+    hull() {
+        translate([15,10]) circle(10);
+        circle(10);
+    }
+}
+
+module concave2dSimple() {
+    hull() {
+        translate([15,10]) square(2);
+        translate([15,0]) square(2);
+        square(2);
+    }
+}
+
+// Works correctly
+module convex2dHole() {
+    hull() {
+        translate([15,10,0]) circle(10);
+        difference() {
+            circle(10);
+            circle(5);
+        }
+    }
+}
+
+
+convex2dHole();
+translate([40,0,0]) convex2dSimple();
+translate([0,-20,0]) concave2dSimple();