From 2a14ab998a576df6ba1fa5dc2c680d9078e58f81 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 12 Apr 2021 14:24:09 +1000 Subject: Fix T87259: Un-Subdivide creates duplicate faces Add argument to BM_vert_collapse_faces to remove any faces that become duplicate as result of the collapse. --- source/blender/bmesh/tools/bmesh_decimate_dissolve.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source/blender/bmesh/tools/bmesh_decimate_dissolve.c') diff --git a/source/blender/bmesh/tools/bmesh_decimate_dissolve.c b/source/blender/bmesh/tools/bmesh_decimate_dissolve.c index 4a024f745ed..8b4a9bb26ac 100644 --- a/source/blender/bmesh/tools/bmesh_decimate_dissolve.c +++ b/source/blender/bmesh/tools/bmesh_decimate_dissolve.c @@ -439,7 +439,7 @@ void BM_mesh_decimate_dissolve_ex(BMesh *bm, for (i = 0; i < vinput_len; i++) { BMVert *v = vinput_arr[i]; if (LIKELY(v != NULL) && BM_vert_is_edge_pair(v)) { - BM_vert_collapse_edge(bm, v->e, v, true, true); /* join edges */ + BM_vert_collapse_edge(bm, v->e, v, true, true, true); /* join edges */ } } } @@ -482,7 +482,7 @@ void BM_mesh_decimate_dissolve_ex(BMesh *bm, BM_vert_is_edge_pair(v) #endif ) { - e_new = BM_vert_collapse_edge(bm, v->e, v, true, true); /* join edges */ + e_new = BM_vert_collapse_edge(bm, v->e, v, true, true, true); /* join edges */ if (e_new) { -- cgit v1.2.3