Merge branch 'master' of github.com:openscad/openscad into issue159

7 files changed, 26 insertions, 0 deletions

diff --git a/testdata/scad/features/background-modifier.scad b/testdata/scad/features/background-modifier.scad
index ec7b28d..5430472 100644
--- a/testdata/scad/features/background-modifier.scad
+++ b/testdata/scad/features/background-modifier.scad
@@ -2,3 +2,4 @@ difference() {
   sphere(r=10);
   %cylinder(h=30, r=6, center=true);
 }
+%if (true) cube([25,6,3], center=true);
diff --git a/testdata/scad/features/control-hull-dimension.scad b/testdata/scad/features/control-hull-dimension.scad
new file mode 100644
index 0000000..c8736db
--- /dev/null
+++ b/testdata/scad/features/control-hull-dimension.scad
@@ -0,0 +1,4 @@
+hull() {
+  circle(1);
+  echo(1);
+}
diff --git a/testdata/scad/features/difference-tests.scad b/testdata/scad/features/difference-tests.scad
index 3bcd9e5..b770764 100644
--- a/testdata/scad/features/difference-tests.scad
+++ b/testdata/scad/features/difference-tests.scad
@@ -28,3 +28,9 @@ translate([24,0,0]) difference() {
   cube([10,10,10], center=true);
   translate([0,0,6.99]) cylinder(r=4, h=4, center=true);
 }
+
+// Subtracting something from nothing
+translate([24,12,0]) difference() {
+  cube([0,10,10], center=true);
+  # cylinder(r=4, h=20, center=true);
+}
diff --git a/testdata/scad/features/disable-modifier.scad b/testdata/scad/features/disable-modifier.scad
index b47e074..2b75339 100644
--- a/testdata/scad/features/disable-modifier.scad
+++ b/testdata/scad/features/disable-modifier.scad
@@ -2,3 +2,4 @@ difference() {
   *sphere(r=10);
   cylinder(h=30, r=6, center=true);
 }
+*if (true) cube([25,6,3], center=true);
diff --git a/testdata/scad/features/highlight-and-background-modifier.scad b/testdata/scad/features/highlight-and-background-modifier.scad
index 945d6b4..5dca703 100644
--- a/testdata/scad/features/highlight-and-background-modifier.scad
+++ b/testdata/scad/features/highlight-and-background-modifier.scad
@@ -1,8 +1,10 @@
 difference() {
   sphere(r=10);
   %#cylinder(h=30, r=6, center=true);
+  %#if (true) cube([6,25,3], center=true);
 }
 translate([13,0,0]) difference() {
   sphere(r=10);
   #%cylinder(h=30, r=6, center=true);
+  #%if (true) cube([6,25,3], center=true);
 }
diff --git a/testdata/scad/features/highlight-modifier.scad b/testdata/scad/features/highlight-modifier.scad
index 1156a88..f228d08 100644
--- a/testdata/scad/features/highlight-modifier.scad
+++ b/testdata/scad/features/highlight-modifier.scad
@@ -2,3 +2,4 @@ difference() {
   sphere(r=10);
   #cylinder(h=30, r=6, center=true);
 }
+#if (true) cube([25,6,3], center=true);
diff --git a/testdata/scad/features/hull3-tests.scad b/testdata/scad/features/hull3-tests.scad
index 12c8a11..e3fc8e7 100644
--- a/testdata/scad/features/hull3-tests.scad
+++ b/testdata/scad/features/hull3-tests.scad
@@ -15,3 +15,14 @@ translate([25,0,0]) hull() {
     cylinder(r=5, h=5, center=true);
   }
 }
+
+// Don't Crash (issue 188)
+
+translate([-5,-5,-5]) {
+  hull() {
+    intersection() {
+      cube([1,1,1]);
+      translate([-1,-1,-1]) cube([1,1,1]);
+    }
+  }
+}