diff options
| author | Marius Kintel <marius@kintel.net> | 2012-01-08 18:14:30 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2012-01-08 18:14:30 (GMT) |
| commit | 3c18145b13759db1a8926e29b81fb41f8efcde4d (patch) | |
| tree | 75cc01dd8507a1667c4ba715cdc408ad785dce19 /src/CGALEvaluator.cc | |
| parent | 11fb1f71dad9c7d744ff5bbe7c3ee017ed67ff41 (diff) | |
| parent | f3e6e8168bac6b14383d1d321de7dcf122e0b7de (diff) | |
Merge branch 'master' into boost_filesystem
Diffstat (limited to 'src/CGALEvaluator.cc')
| -rw-r--r-- | src/CGALEvaluator.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/CGALEvaluator.cc b/src/CGALEvaluator.cc index a54fe02..88d1f00 100644 --- a/src/CGALEvaluator.cc +++ b/src/CGALEvaluator.cc @@ -85,6 +85,11 @@ void CGALEvaluator::process(CGAL_Nef_polyhedron &target, const CGAL_Nef_polyhedr // union && difference assert triggered by testdata/scad/bugs/rotate-diff-nonmanifold-crash.scad std::string opstr = op == CGE_UNION ? "union" : op == CGE_INTERSECTION ? "intersection" : op == CGE_DIFFERENCE ? "difference" : op == CGE_MINKOWSKI ? "minkowski" : "UNKNOWN"; PRINTF("CGAL error in CGAL_Nef_polyhedron's %s operator: %s", opstr.c_str(), e.what()); + + // Minkowski errors can result in corrupt polyhedrons + if (op == CGE_MINKOWSKI) { + target = src; + } } CGAL::set_error_behaviour(old_behaviour); } |