diff options
author | Marius Kintel <marius@kintel.net> | 2011-12-28 17:06:32 (GMT) |
---|---|---|
committer | Marius Kintel <marius@kintel.net> | 2011-12-28 17:06:32 (GMT) |
commit | e8b8c45bad6e0a9fd3054dff8557aede0111ac23 (patch) | |
tree | 71a5777f877849b5e821beb4fcff80949ebbd9bd | |
parent | 22072c1c218f9a4e9f8b39072c7e27404488171f (diff) | |
parent | c6004a5c27f7cbe2fed10e2c20b7735af2945014 (diff) |
Merge branch 'master' into color-priority
-rw-r--r-- | testdata/scad/features/intersection-tests.scad | 2 | ||||
-rw-r--r-- | tests/regression/cgalpngtest/intersection-tests-expected.png | bin | 8295 -> 7455 bytes |
2 files changed, 1 insertions, 1 deletions
diff --git a/testdata/scad/features/intersection-tests.scad b/testdata/scad/features/intersection-tests.scad index e53f3c9..4a1d7e3 100644 --- a/testdata/scad/features/intersection-tests.scad +++ b/testdata/scad/features/intersection-tests.scad @@ -22,7 +22,7 @@ translate([12,0,0]) intersection() { translate([12,12,0]) intersection() { cube([10,10,10], center=true); - translate([0,0,7]) cylinder(r=4, h=4, center=true); + translate([0,0,7.01]) cylinder(r=4, h=4, center=true); } translate([24,0,0]) intersection() { diff --git a/tests/regression/cgalpngtest/intersection-tests-expected.png b/tests/regression/cgalpngtest/intersection-tests-expected.png Binary files differindex 6d004b0..d287e5f 100644 --- a/tests/regression/cgalpngtest/intersection-tests-expected.png +++ b/tests/regression/cgalpngtest/intersection-tests-expected.png |