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

diff --git a/testdata/scad/features/union-tests.scad b/testdata/scad/features/union-tests.scad
new file mode 100644
index 0000000..718aa8c
--- /dev/null
+++ b/testdata/scad/features/union-tests.scad
@@ -0,0 +1,29 @@
+translate([-12,0,0]) union() {
+  cube([10,10,10]);
+  translate([4,4,8]) cube([2,2,10]);
+}
+
+union() {
+  cube([10,10,10]);
+  translate([0,0,10]) cube([2,2,10]);
+}
+
+translate([12,0,0]) union() {
+  cube([10,10,10]);
+  translate([0,0,11]) cube([2,2,10]);
+}
+
+translate([24,0,0]) union() {
+  cube([10,10,10]);
+  translate([4,4,10]) cube([2,2,10]);
+}
+
+translate([-12,12,0]) union() {
+  cube([10,10,10]);
+  translate([-2,10,10]) cube([2,2,10]);
+}
+
+translate([0,12,0]) union() {
+  cube([10,10,10]);
+  translate([0,10,10]) cube([2,2,10]);
+}