TriangleMeshSlicer: Got rid of admesh!

3 files changed, 8 insertions, 7 deletions

diff --git a/src/libslic3r/SLA/Hollowing.cpp b/src/libslic3r/SLA/Hollowing.cpp
index f55a10178..1d3016bde 100644
--- a/src/libslic3r/SLA/Hollowing.cpp
+++ b/src/libslic3r/SLA/Hollowing.cpp
@@ -296,9 +296,8 @@ void cut_drainholes(std::vector<ExPolygons> & obj_slices,
     if (mesh.empty()) return;
     
     mesh.require_shared_vertices();
-    
-    std::vector<ExPolygons> hole_slices;
-    slice_mesh(mesh, slicegrid, closing_radius, hole_slices, thr);
+ 
+    std::vector<ExPolygons> hole_slices = slice_mesh_ex(mesh.its, slicegrid, closing_radius, thr);
     
     if (obj_slices.size() != hole_slices.size())
         BOOST_LOG_TRIVIAL(warning)
diff --git a/src/libslic3r/SLA/Pad.cpp b/src/libslic3r/SLA/Pad.cpp
index 658ecf6d8..bf2b4cf54 100644
--- a/src/libslic3r/SLA/Pad.cpp
+++ b/src/libslic3r/SLA/Pad.cpp
@@ -478,8 +478,8 @@ void pad_blueprint(const TriangleMesh &      mesh,
 {
     if (mesh.empty()) return;
 
-    auto out = reserve_vector<ExPolygons>(heights.size());
-    slice_mesh(mesh, heights, out, thrfn);
+    assert(mesh.has_shared_vertices());
+    std::vector<ExPolygons> out = slice_mesh_ex(mesh.its, heights, thrfn);
 
     size_t count = 0;
     for(auto& o : out) count += o.size();
diff --git a/src/libslic3r/SLA/SupportTree.cpp b/src/libslic3r/SLA/SupportTree.cpp
index 45e90a704..14a4dc360 100644
--- a/src/libslic3r/SLA/SupportTree.cpp
+++ b/src/libslic3r/SLA/SupportTree.cpp
@@ -45,7 +45,8 @@ std::vector<ExPolygons> SupportTree::slice(
 
     if (!sup_mesh.empty()) {
         slices.emplace_back();
-        slice_mesh(sup_mesh, grid, cr, slices.back(), ctl().cancelfn);
+        assert(sup_mesh.has_shared_vertices());
+        slices.back() = slice_mesh_ex(sup_mesh.its, grid, cr, ctl().cancelfn);
     }
 
     if (!pad_mesh.empty()) {
@@ -58,7 +59,8 @@ std::vector<ExPolygons> SupportTree::slice(
         auto padgrid = reserve_vector<float>(size_t(cap > 0 ? cap : 0));
         std::copy(grid.begin(), maxzit, std::back_inserter(padgrid));
 
-        slice_mesh(pad_mesh, padgrid, cr, slices.back(), ctl().cancelfn);
+        assert(pad_mesh.has_shared_vertices());
+        slices.back() = slice_mesh_ex(pad_mesh.its, padgrid, cr, ctl().cancelfn);
     }
 
     size_t len = grid.size();