Merge prusa 2.6.1

This commit is contained in:
QIDI TECH
2023-09-16 16:26:29 +08:00
parent 1338e60f8b
commit 963e22db99
203 changed files with 25254 additions and 6453 deletions

View File

@@ -155,10 +155,10 @@ It check_csgmesh_booleans(const Range<It> &csgrange, Visitor &&vfn)
if (!m || MeshBoolean::cgal::empty(*m))
return;
if (!MeshBoolean::cgal::does_bound_a_volume(*m))
if (MeshBoolean::cgal::does_self_intersect(*m))
return;
if (MeshBoolean::cgal::does_self_intersect(*m))
if (!MeshBoolean::cgal::does_bound_a_volume(*m))
return;
}
catch (...) { return; }