Merge branch 'master' into boost_filesystem

Conflicts:
	tests/CMakeLists.txt

2 files changed, 15 insertions, 0 deletions

diff --git a/testdata/scad/bugs/bbox-transform-bug.scad b/testdata/scad/bugs/bbox-transform-bug.scad
new file mode 100644
index 0000000..ccd2eab
--- /dev/null
+++ b/testdata/scad/bugs/bbox-transform-bug.scad
@@ -0,0 +1,9 @@
+//
+// Bug description: The intersection results in an empty object.
+// Cause: The rotated bounding box is wrongly calculated, yielding a
+// box which don't overlap with the bounding box of the second object.
+//
+intersection() {
+  rotate(45) cube(10);
+  translate([3,2,0]) cube(10);
+}
diff --git a/testdata/scad/features/render-2d-tests.scad b/testdata/scad/features/render-2d-tests.scad
new file mode 100644
index 0000000..683ffe4
--- /dev/null
+++ b/testdata/scad/features/render-2d-tests.scad
@@ -0,0 +1,6 @@
+render() {
+  difference() {
+    square(100, center=true);
+    circle(r=30);
+  }
+}