diff options
| author | Don Bright <hugh.m.bright@gmail.com> | 2011-11-27 04:21:38 (GMT) |
|---|---|---|
| committer | Don Bright <hugh.m.bright@gmail.com> | 2011-11-27 04:21:38 (GMT) |
| commit | 610ab20ddba6d07e9b6e0b7565a44913854e467b (patch) | |
| tree | 81c75e9ce9b68490bc5a81293290b96bb49d9510 /src/cgalutils.cc | |
| parent | 2376814f2c4dd6e34a765ca37275b136785b26fd (diff) | |
| parent | 04c340b35d8809b595ebb3ce53b7a00313d00a9b (diff) | |
Merge remote branch 'upstream/master' into cakebaby
Conflicts:
doc/testing.txt
tests/CMakeLists.txt
tests/system-gl.cc
tests/system-gl.h
Diffstat (limited to 'src/cgalutils.cc')
| -rw-r--r-- | src/cgalutils.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/cgalutils.cc b/src/cgalutils.cc index e77f5dd..1de7ab4 100644 --- a/src/cgalutils.cc +++ b/src/cgalutils.cc @@ -140,8 +140,10 @@ CGAL_Polyhedron *createPolyhedronFromPolySet(const PolySet &ps) } catch (CGAL::Assertion_exception e) { PRINTF("CGAL error in CGAL_Build_PolySet: %s", e.what()); - CGAL::set_error_behaviour(old_behaviour); + delete P; + P = NULL; } + CGAL::set_error_behaviour(old_behaviour); return P; } |