3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-24 15:13:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

CGAL may have infinite face vertex ranges.

Browse source 
Calling vtc.size() may end up in an infinite loop. Also, quads do not appear in CGAL meshes.
This commit is contained in:
tamasmeszaros 2021-03-17 09:42:03 +01:00
parent 92de7bafc6
commit 0c4fb6dfcc
1 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/libslic3r/MeshBoolean.cpp
View file

@ -150,11 +150,20 @@ template<class _Mesh> TriangleMesh cgal_to_triangle_mesh(const _Mesh &cgalmesh)
} }
for (auto &face : cgalmesh.faces()) { for (auto &face : cgalmesh.faces()) {
auto vtc = cgalmesh.vertices_around_face(cgalmesh.halfedge(face)); auto vtc = cgalmesh.vertices_around_face(cgalmesh.halfedge(face));
int i = 0;
Vec3i trface; int i = 0;
for (auto v : vtc) trface(i++) = static_cast<int>(v); Vec3i facet;
facets.emplace_back(trface); for (const auto &v : vtc) {
if (i > 2) { i = 0; break; }
facet(i++) = v;
}
if (i == 3) {
facets.emplace_back(facet);
} else {
BOOST_LOG_TRIVIAL(error) << "CGAL face is not a triangle.";
}
} }
TriangleMesh out{points, facets}; TriangleMesh out{points, facets};