Fixed conflicts after merge with master

tests/sla_print/sla_raycast_tests.cpp

@@ -39,7 +39,7 @@ TEST_CASE("Raycaster - find intersections of a line and cylinder")
     REQUIRE(std::abs(out[1].first - std::sqrt(72.f)) < 0.001f);
 }
 
-
+#ifdef SLIC3R_HOLE_RAYCASTER
 // Create a simple scene with a 20mm cube and a big hole in the front wall 
 // with 5mm radius. Then shoot rays from interesting positions and see where
 // they land.
@@ -94,3 +94,4 @@ TEST_CASE("Raycaster with loaded drillholes", "[sla_raycast]")
     // Check for support tree correctness
     test_support_model_collision("20mm_cube.obj", {}, hcfg, holes);
 }
+#endif

tests/sla_print/sla_test_utils.cpp

@@ -105,8 +105,13 @@ void test_supports(const std::string          &obj_filename,
     // Create the special index-triangle mesh with spatial indexing which
     // is the input of the support point and support mesh generators
     sla::EigenMesh3D emesh{mesh};
+
+#ifdef SLIC3R_HOLE_RAYCASTER
     if (hollowingcfg.enabled) 
         emesh.load_holes(drainholes);
+#endif
+
+    // TODO: do the cgal hole cutting...
     
     // Create the support point generator
     sla::SupportPointGenerator::Config autogencfg;