Merge remote branch 'upstream/master'

1 files changed, 29 insertions, 0 deletions

diff --git a/tests/regression/dumptest/example015-expected.txt b/tests/regression/dumptest/example015-expected.txt
new file mode 100644
index 0000000..24a3bbd
--- /dev/null
+++ b/tests/regression/dumptest/example015-expected.txt
@@ -0,0 +1,29 @@
+	group() {
+		difference() {
+			multmatrix([[1, 0, 0, -35], [0, 1, 0, -35], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+				intersection() {
+					union() {
+						difference() {
+							square(size = [100, 100], center = true);
+							square(size = [50, 50], center = true);
+						}
+						multmatrix([[1, 0, 0, 50], [0, 1, 0, 50], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+							square(size = [15, 15], center = true);
+						}
+					}
+					multmatrix([[0.707107, -0.707107, 0, 0], [0.707107, 0.707107, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+						multmatrix([[1, 0, 0, 0], [0, 1, 0, -15], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+							square(size = [100, 30], center = false);
+						}
+					}
+				}
+			}
+			multmatrix([[0.707107, 0.707107, 0, 0], [-0.707107, 0.707107, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+				multmatrix([[0.7, 0, 0, 0], [0, 1.3, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+					circle($fn = 0, $fa = 12, $fs = 1, r = 5);
+				}
+			}
+		}
+		import(file = "/Users/kintel/code/OpenSCAD/openscad/examples/example009.dxf", cache = "4d38d4de.59bc", layer = "body", origin = [0, 0], scale = 2, convexity = 6, $fn = 0, $fa = 12, $fs = 1);
+	}
+