Merge branch 'master' into color-priority

tests/CMakeLists.txt

@@ -577,12 +577,15 @@ list(APPEND CGALSTLSANITYTEST_FILES ${CMAKE_SOURCE_DIR}/../testdata/scad/misc/no
 # Once we're capable of comparing these across platforms, we can put these back in
 disable_tests(dumptest_transform-tests
               dumptest_render-tests
+              dumptest_difference-tests
+              dumptest_intersection-tests
               dumptest_example001
               dumptest_example005
               dumptest_example006
               dumptest_example007
               dumptest_example008
               dumptest_example012
+              dumptest_example013
               dumptest_example016
               dumptest_example020
               dumptest_example021)

tests/regression/dumptest/intersection-tests-expected.txt

@@ -24,7 +24,7 @@
 	multmatrix([[1, 0, 0, 12], [0, 1, 0, 12], [0, 0, 1, 0], [0, 0, 0, 1]]) {
 		intersection() {
 			cube(size = [10, 10, 10], center = true);
-			multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, 7], [0, 0, 0, 1]]) {
+			multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, 7.01], [0, 0, 0, 1]]) {
 				cylinder($fn = 0, $fa = 12, $fs = 2, h = 4, r1 = 4, r2 = 4, center = true);
 			}
 		}