diff options
| author | Marius Kintel <marius@kintel.net> | 2013-12-15 23:25:22 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2013-12-15 23:25:22 (GMT) |
| commit | 4be55c016ec0af199820e116a9b358180581eaf4 (patch) | |
| tree | 1d0030c4754d8df60f1515e52a0cb1fb16bc70f9 /src/CGAL_Nef_polyhedron.cc | |
| parent | 70dfdf42c33356fa0c7b7cdf7b2681eab84a4a30 (diff) | |
| parent | dced79fb2d6a4bb1bd5992e611e1c209b910f820 (diff) | |
Merge branch 'master' of github.com:openscad/openscad
Diffstat (limited to 'src/CGAL_Nef_polyhedron.cc')
| -rw-r--r-- | src/CGAL_Nef_polyhedron.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/CGAL_Nef_polyhedron.cc b/src/CGAL_Nef_polyhedron.cc index 49b9a53..ea9accd 100644 --- a/src/CGAL_Nef_polyhedron.cc +++ b/src/CGAL_Nef_polyhedron.cc @@ -96,6 +96,7 @@ PolySet *CGAL_Nef_polyhedron::convertToPolyset() } else if (this->dim == 3) { CGAL::Failure_behaviour old_behaviour = CGAL::set_error_behaviour(CGAL::THROW_EXCEPTION); + ps = new PolySet(); bool err = true; std::string errmsg(""); CGAL_Polyhedron P; @@ -107,11 +108,11 @@ PolySet *CGAL_Nef_polyhedron::convertToPolyset() err = true; errmsg = std::string(e.what()); } + if (!err) err = createPolySetFromPolyhedron(P, *ps); if (err) { PRINT("ERROR: CGAL NefPolyhedron->Polyhedron conversion failed."); if (errmsg!="") PRINTB("ERROR: %s",errmsg); - } else { - ps = createPolySetFromPolyhedron(P); + delete ps; ps = NULL; } CGAL::set_error_behaviour(old_behaviour); } |