Merge branch 'master' into boost_filesystem

Conflicts:
	boost.pri
	tests/CMakeLists.txt

1 files changed, 8 insertions, 1 deletions

diff --git a/testdata/scad/features/hull2-tests.scad b/testdata/scad/features/hull2-tests.scad
index 3bea3c5..e656e6a 100644
--- a/testdata/scad/features/hull2-tests.scad
+++ b/testdata/scad/features/hull2-tests.scad
@@ -13,7 +13,6 @@ module concave2dSimple() {
     }
 }
 
-// Works correctly
 module convex2dHole() {
     hull() {
         translate([15,10,0]) circle(10);
@@ -24,7 +23,15 @@ module convex2dHole() {
     }
 }
 
+module hull2dForLoop() {
+  hull() {
+    for(x = [0,10])
+      for(y=[0,10])
+        translate([x,y]) circle(3);
+  }
+}
 
 convex2dHole();
 translate([40,0,0]) convex2dSimple();
 translate([0,-20,0]) concave2dSimple();
+translate([30,-25,0]) hull2dForLoop();