Merge branch 'master' into color-priority

2011-12-28 18:16:17 +01:00 · 2011-12-28 18:16:17 +01:00 · 6b5c103d57
parent e8b8c45bad 732803039d
commit 6b5c103d57
2 changed files with 4 additions and 4 deletions
--- a/examples/example008.scad
+++ b/examples/example008.scad
@ -20,13 +20,13 @@ difference()

 	intersection()
 	{
-		translate([ -125, -25, -25])
-		linear_extrude(height = 50, convexity = 1)
+		translate([ -125, -25, -26])
+		linear_extrude(height = 52, convexity = 1)
 			import(file = "example008.dxf", layer = "X");

 		rotate(90, [0, 1, 0])
-		translate([ -125, -25, -25])
-		linear_extrude(height = 50, convexity = 1)
+		translate([ -125, -25, -26])
+		linear_extrude(height = 52, convexity = 1)
 			import(file = "example008.dxf", layer = "X");
 	}
 }
--- a/tests/regression/throwntogethertest/example008-expected.png
+++ b/tests/regression/throwntogethertest/example008-expected.png