Merge remote-tracking branch 'origin/master' into gridfix

scripts/travis-ci.sh

@@ -13,7 +13,7 @@ if [[ $? != 0 ]]; then
 fi
 # Exclude tests known the cause issues on Travis
 # opencsgtest_rotate_extrude-tests - Fails on Ubuntu 12.04 using Gallium 0.4 drivers
-ctest -j8 -E "opencsgtest_rotate_extrude-tests|opencsgtest_render-tests|opencsgtest_rotate_extrude-hole|opencsgtest_internal-cavity|opencsgtest_internal-cavity-polyhedron|opencsgtest_minkowski3-erosion"
+ctest -j8 -E "opencsgtest_rotate_extrude-tests|opencsgtest_render-tests|opencsgtest_rotate_extrude-hole|opencsgtest_internal-cavity|opencsgtest_internal-cavity-polyhedron|opencsgtest_minkowski3-erosion|opencsgtest_issue835|opencsgtest_issue911|opencsgtest_issue913"
 if [[ $? != 0 ]]; then
   echo "Test failure"
   exit 1

src/mainwin.cc

@@ -1931,7 +1931,7 @@ void MainWindow::actionCheckValidity() {
 		N.reset(CGALUtils::createNefPolyhedronFromGeometry(*ps));
 	}
 	if (N || (N = dynamic_pointer_cast<const CGAL_Nef_polyhedron>(this->root_geom))) {
-		valid = N->p3->is_valid();
+            valid = N->p3 ? N->p3->is_valid() : false;
 	}
 	PRINTB("   Valid:      %6s", (valid ? "yes" : "no"));
 	clearCurrentOutput();

testdata/scad/3D/issues/issue1004.scad

@@ -1,2 +1,2 @@
 %square(20);
-cube(10);
+translate([1,1,0]) cube(10);

testdata/scad/3D/issues/issue835.scad

@@ -1,7 +1,7 @@
 difference() {
     cube([20,20,3], center=true);
 
-    linear_extrude(height=60, center=true, convexity=2) {
+    linear_extrude(height=10, center=true, convexity=2) {
         translate([5,0]) circle(r=3);
         translate([-5,5]) circle(r=3);
         translate([-5,-5]) circle(r=3);

testdata/scad/bugs/issue945b.scad

@@ -0,0 +1,2 @@
+rotate([0, 45, 0]) cube(50, true);
+rotate([0, 0, 45]) cube(50, true);

testdata/scad/bugs/issue945d.scad

@@ -0,0 +1,2 @@
+translate([-5,5,0]) cube(10);
+rotate([0, -90, 0]) cube(10);

tests/CMakeLists.txt

@@ -1213,8 +1213,10 @@ list(APPEND BUGS_FILES ${CMAKE_SOURCE_DIR}/../testdata/scad/bugs/issue584.scad
                        ${CMAKE_SOURCE_DIR}/../testdata/scad/bugs/issue802.scad
                        ${CMAKE_SOURCE_DIR}/../testdata/scad/bugs/issue899.scad
                        ${CMAKE_SOURCE_DIR}/../testdata/scad/bugs/issue904.scad
-                       ${CMAKE_SOURCE_DIR}/../testdata/scad/bugs/issue936.scad
                        ${CMAKE_SOURCE_DIR}/../testdata/scad/bugs/issue945.scad
+                       ${CMAKE_SOURCE_DIR}/../testdata/scad/bugs/issue945b.scad
+                       ${CMAKE_SOURCE_DIR}/../testdata/scad/bugs/issue945c.scad
+                       ${CMAKE_SOURCE_DIR}/../testdata/scad/bugs/issue945d.scad
                        ${CMAKE_SOURCE_DIR}/../testdata/scad/bugs/issue1089.scad
                        ${CMAKE_SOURCE_DIR}/../testdata/scad/bugs/issue1105.scad)
 list(APPEND EXPORT3D_TEST_FILES ${BUGS_FILES})