diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-03-05 12:52:00 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-03-05 12:52:00 +0400 |
| commit | a659d73b1db1e2a95f23f5d4375ff9f2db2045fe (patch) | |
| tree | 5f3b772d2971b1910d91ec63cd8f07c755fdfa39 | |
| parent | 6ddb1faca976744c2c714c242d781cd42a226ef0 (diff) | |
Added back code which was commented out for debug reasons
Also added a patchset for Carve's memory leak fix.
| -rw-r--r-- | extern/carve/carve-capi.cc | 2 | ||||
| -rw-r--r-- | extern/carve/patches/memory_leak_fix.patch | 11 | ||||
| -rw-r--r-- | extern/carve/patches/series | 1 |
3 files changed, 13 insertions, 1 deletions
diff --git a/extern/carve/carve-capi.cc b/extern/carve/carve-capi.cc index ef7a95e578b..a65d1a8d766 100644 --- a/extern/carve/carve-capi.cc +++ b/extern/carve/carve-capi.cc @@ -720,7 +720,7 @@ bool carve_performBooleanOperation(CarveMeshDescr *left_mesh, if (output_descr->poly) { output_descr->poly->transform(rev_r); - //dissolveTriangulatedEdges(output_descr); + dissolveTriangulatedEdges(output_descr); } } catch (carve::exception e) { diff --git a/extern/carve/patches/memory_leak_fix.patch b/extern/carve/patches/memory_leak_fix.patch new file mode 100644 index 00000000000..c6aff1bf837 --- /dev/null +++ b/extern/carve/patches/memory_leak_fix.patch @@ -0,0 +1,11 @@ +diff -r e82d852e4fb0 include/carve/csg_triangulator.hpp +--- a/include/carve/csg_triangulator.hpp Wed Jan 15 13:16:14 2014 +1100 ++++ b/include/carve/csg_triangulator.hpp Wed Mar 05 14:43:56 2014 +0600 +@@ -426,6 +426,7 @@ + findPerimeter(grp_tris, vloop, grp_perim); + out_faces.push_back(face->create(grp_perim.begin(), grp_perim.end(), false)); + } ++ delete face; + } + std::swap(faces, out_faces); + } diff --git a/extern/carve/patches/series b/extern/carve/patches/series index 2c187af4808..b1254dd9a7d 100644 --- a/extern/carve/patches/series +++ b/extern/carve/patches/series @@ -7,3 +7,4 @@ clang_is_heap_fix.patch strict_flags.patch interpolator_reorder.patch mesh_simplify_dissolve_edges.patch +memory_leak_fix.patch |