diff options
author | Howard Trickey <howard.trickey@gmail.com> | 2020-12-10 17:11:43 +0300 |
---|---|---|
committer | Howard Trickey <howard.trickey@gmail.com> | 2020-12-10 17:15:16 +0300 |
commit | 1d447dcd19120ed2fd14511589220438ce1904bc (patch) | |
tree | 4a6b376a2d939ee71befb49c65e26b5413fe6356 | |
parent | 348bd319d5a88f45410a22f8ce2f527d8da48ef0 (diff) |
Fix T83630 Exact Boolean assert failure in Debug build.
I thought I had reasoned that the add_patch would only happen
when the patch was not already in a cell, but I missed reasoning
about merged cells. So switched to a set 'add' instead of 'add_new'.
-rw-r--r-- | source/blender/blenlib/intern/mesh_boolean.cc | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/source/blender/blenlib/intern/mesh_boolean.cc b/source/blender/blenlib/intern/mesh_boolean.cc index 2db939cd628..88d90a7816f 100644 --- a/source/blender/blenlib/intern/mesh_boolean.cc +++ b/source/blender/blenlib/intern/mesh_boolean.cc @@ -401,11 +401,6 @@ class Cell { void add_patch(int p) { - patches_.add_new(p); - } - - void add_patch_non_duplicates(int p) - { patches_.add(p); } @@ -693,7 +688,7 @@ static void merge_cells(int merge_to, int merge_from, CellsInfo &cinfo, PatchesI merge_to_cell = cinfo.cell(final_merge_to); } for (int cell_p : merge_from_cell.patches()) { - merge_to_cell.add_patch_non_duplicates(cell_p); + merge_to_cell.add_patch(cell_p); Patch &patch = pinfo.patch(cell_p); if (patch.cell_above == merge_from) { patch.cell_above = merge_to; |