Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Added back code which was commented out for debug reasons

Browse Source 
Also added a patchset for Carve's memory leak fix.
This commit is contained in:
Sergey Sharybin
2014-03-05 14:52:00 +06:00
parent 6ddb1faca9
commit a659d73b1d
3 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extern/carve/carve-capi.cc vendored
View File

@@ -720,7 +720,7 @@ bool carve_performBooleanOperation(CarveMeshDescr *left_mesh,
if (output_descr->poly) { if (output_descr->poly) {
output_descr->poly->transform(rev_r); output_descr->poly->transform(rev_r);
//dissolveTriangulatedEdges(output_descr); dissolveTriangulatedEdges(output_descr);
} }
} }
catch (carve::exception e) { catch (carve::exception e) {

11
extern/carve/patches/memory_leak_fix.patch vendored Normal file
View 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
View File

@@ -7,3 +7,4 @@ clang_is_heap_fix.patch
strict_flags.patch strict_flags.patch
interpolator_reorder.patch interpolator_reorder.patch
mesh_simplify_dissolve_edges.patch mesh_simplify_dissolve_edges.patch
memory_leak_fix.patch