juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-10-05 14:51:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

CAD: catch OCCT failures in body_touching_sketch, Standard_Failure first

Browse Source 
The extrude default query must never throw; on OCCT >= 8 Standard_Failure
derives from std::exception, so its handler comes first.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01QK4VgguuCAk2hZLWgcjJb9
This commit is contained in:
Claude
2026-09-30 08:34:25 +00:00
parent 205bc1b332
commit ae1dc95756
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libslic3r/CAD/CadDocument.cpp
+13 -9
View File
@@ -2463,15 +2463,19 @@ int CadDocument::body_touching_sketch(int sketch_ref) const
if (sketch_ref < 0 || sketch_ref >= int(features.size())
|| features[sketch_ref].type != CadFeatureType::Sketch)
return -1;
TopoDS_Face face;
try { face = build_sketch_face(features[sketch_ref]); } catch (const std::exception&) { return -1; }
if (face.IsNull()) return -1;
for (int i = int(bodies.size()) - 1; i >= 0; --i) { // newest first: the likeliest target
const TopoDS_Shape& b = bodies[i].shape;
if (b.IsNull() || is_sheet_shape(b)) continue;
BRepExtrema_DistShapeShape d(face, b);
if (d.IsDone() && d.Value() <= 1e-4)
return i;
// A query that only picks a default: any failure answers "touches nothing".
try {
const TopoDS_Face face = build_sketch_face(features[sketch_ref]);
if (face.IsNull()) return -1;
for (int i = int(bodies.size()) - 1; i >= 0; --i) { // newest first: the likeliest target
const TopoDS_Shape& b = bodies[i].shape;
if (b.IsNull() || is_sheet_shape(b)) continue;
BRepExtrema_DistShapeShape d(face, b);
if (d.IsDone() && d.Value() <= 1e-4)
return i;
}
} catch (const Standard_Failure&) { // before std::exception: on OCCT >= 8 it derives from it
} catch (const std::exception&) {
}
return -1;
}