diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-06-11 11:13:36 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-06-11 11:13:36 +0400 |
| commit | e53c00a2db9e3bf33badca135630d4f5d24b2087 (patch) | |
| tree | 60550a1728b074124253b348f77295326b43610d /extern/carve | |
| parent | bd43ac04a5b36743d7234e076c1d9b39657dda48 (diff) | |
Add patchset to recent Carve changes
In the future i'd rather have this reported to an
upstream instead of adding local changes. It's really
easy to override this changes if patchset is not added
and this is to be fixed in upstream. Also the function
was never used so it was rather totally harmless warning
for us.
Diffstat (limited to 'extern/carve')
| -rw-r--r-- | extern/carve/patches/mesh_simplify_uninitialized_var.patch | 12 | ||||
| -rw-r--r-- | extern/carve/patches/series | 1 |
2 files changed, 13 insertions, 0 deletions
diff --git a/extern/carve/patches/mesh_simplify_uninitialized_var.patch b/extern/carve/patches/mesh_simplify_uninitialized_var.patch new file mode 100644 index 00000000000..592c6db0b68 --- /dev/null +++ b/extern/carve/patches/mesh_simplify_uninitialized_var.patch @@ -0,0 +1,12 @@ +diff -r e82d852e4fb0 include/carve/mesh_simplify.hpp +--- a/include/carve/mesh_simplify.hpp Wed Jan 15 13:16:14 2014 +1100 ++++ b/include/carve/mesh_simplify.hpp Wed Jun 11 13:13:09 2014 +0600 +@@ -1414,7 +1414,7 @@ + + + size_t removeLowVolumeManifolds(meshset_t *meshset, double min_abs_volume) { +- size_t n_removed; ++ size_t n_removed = 0; + for (size_t i = 0; i < meshset->meshes.size(); ++i) { + if (fabs(meshset->meshes[i]->volume()) < min_abs_volume) { + delete meshset->meshes[i]; diff --git a/extern/carve/patches/series b/extern/carve/patches/series index 529bf43a858..4691339b419 100644 --- a/extern/carve/patches/series +++ b/extern/carve/patches/series @@ -7,6 +7,7 @@ clang_is_heap_fix.patch strict_flags.patch interpolator_reorder.patch mesh_simplify_dissolve_edges.patch +mesh_simplify_uninitialized_var.patch memory_leak_fix.patch msvc_fix.patch face_hole_merge_workaround.patch |