Merge remote branch 'upstream/master' into cakebaby

Conflicts:
	doc/testing.txt
	tests/CMakeLists.txt
	tests/system-gl.cc
	tests/system-gl.h

1 files changed, 11 insertions, 14 deletions

diff --git a/examples/example007.scad b/examples/example007.scad
index fe69f84..6a57a3b 100644
--- a/examples/example007.scad
+++ b/examples/example007.scad
@@ -5,30 +5,27 @@ module cutout()
 		{
 			rotate(90, [1, 0, 0])
 			translate([0, 0, -50])
-				dxf_linear_extrude(
-						file = "example007.dxf",
-						layer = "cutout1",
-						height = 100,
-						convexity = 1);
+				linear_extrude(height = 100, convexity = 1)
+					import(file = "example007.dxf", layer = "cutout1");
 			
 			rotate(90, [0, 0, 1])
 			rotate(90, [1, 0, 0])
 			translate([0, 0, -50])
-				dxf_linear_extrude(
-						file = "example007.dxf",
-						layer = "cutout2",
-						height = 100,
-						convexity = 2);
+				linear_extrude(height = 100, convexity = 2)
+					import(file = "example007.dxf", layer = "cutout2");
 		}
 }
 
 module clip()
 {
 	difference() {
-		dxf_rotate_extrude(
-				file = "example007.dxf",
-				layer="dorn",
-				convexity = 3);
+		// NB! We have to use the deprecated module here since the "dorn"
+                // layer contains an open polyline, which is not yet supported
+                // by the import() module.
+		rotate_extrude(
+			file = "example007.dxf",
+			layer="dorn",
+			convexity = 3);
 		for (r = [0, 90])
 			rotate(r, [0, 0, 1])
 				cutout();