3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix crash when the interior is corrupted

Browse source
This commit is contained in:
tamasmeszaros 2021-03-02 18:48:24 +01:00
parent 4374716bfb
commit fbc758642b
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/libslic3r/SLAPrintSteps.cpp
View file

@ -166,13 +166,18 @@ void SLAPrint::Steps::drill_holes(SLAPrintObject &po)
// holes that are no longer on the frontend. // holes that are no longer on the frontend.
TriangleMesh &hollowed_mesh = po.m_hollowing_data->hollow_mesh_with_holes; TriangleMesh &hollowed_mesh = po.m_hollowing_data->hollow_mesh_with_holes;
hollowed_mesh = po.transformed_mesh(); hollowed_mesh = po.transformed_mesh();
sla::hollow_mesh(hollowed_mesh, *po.m_hollowing_data->interior); if (is_hollowed)
sla::hollow_mesh(hollowed_mesh, *po.m_hollowing_data->interior);
TriangleMesh &mesh_view = po.m_hollowing_data->hollow_mesh_with_holes_trimmed; TriangleMesh &mesh_view = po.m_hollowing_data->hollow_mesh_with_holes_trimmed;
if (! needs_drilling) { if (! needs_drilling) {
mesh_view = po.transformed_mesh(); mesh_view = po.transformed_mesh();
sla::hollow_mesh(mesh_view, *po.m_hollowing_data->interior, sla::hfRemoveInsideTriangles);
if (is_hollowed)
sla::hollow_mesh(mesh_view, *po.m_hollowing_data->interior,
sla::hfRemoveInsideTriangles);
BOOST_LOG_TRIVIAL(info) << "Drilling skipped (no holes)."; BOOST_LOG_TRIVIAL(info) << "Drilling skipped (no holes).";
return; return;
} }
@ -200,9 +205,13 @@ void SLAPrint::Steps::drill_holes(SLAPrintObject &po)
try { try {
MeshBoolean::cgal::minus(*hollowed_mesh_cgal, *holes_mesh_cgal); MeshBoolean::cgal::minus(*hollowed_mesh_cgal, *holes_mesh_cgal);
hollowed_mesh = MeshBoolean::cgal::cgal_to_triangle_mesh(*hollowed_mesh_cgal); hollowed_mesh = MeshBoolean::cgal::cgal_to_triangle_mesh(*hollowed_mesh_cgal);
mesh_view = hollowed_mesh; mesh_view = hollowed_mesh;
sla::remove_inside_triangles(mesh_view, *po.m_hollowing_data->interior);
if (is_hollowed)
sla::remove_inside_triangles(mesh_view,
*po.m_hollowing_data->interior,
drainholes);
} catch (const std::runtime_error &) { } catch (const std::runtime_error &) {
throw Slic3r::SlicingError(L( throw Slic3r::SlicingError(L(
"Drilling holes into the mesh failed. " "Drilling holes into the mesh failed. "