forked from bartvdbraak/blender
Added back code which was commented out for debug reasons
Also added a patchset for Carve's memory leak fix.
This commit is contained in:
parent
6ddb1faca9
commit
a659d73b1d
2
extern/carve/carve-capi.cc
vendored
2
extern/carve/carve-capi.cc
vendored
@ -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) {
|
||||
|
11
extern/carve/patches/memory_leak_fix.patch
vendored
Normal file
11
extern/carve/patches/memory_leak_fix.patch
vendored
Normal file
@ -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);
|
||||
}
|
1
extern/carve/patches/series
vendored
1
extern/carve/patches/series
vendored
@ -7,3 +7,4 @@ clang_is_heap_fix.patch
|
||||
strict_flags.patch
|
||||
interpolator_reorder.patch
|
||||
mesh_simplify_dissolve_edges.patch
|
||||
memory_leak_fix.patch
|
||||
|
Loading…
Reference in New Issue
Block a user