Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-01-16 07:26:16 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-01-16 07:31:54 +0300
commit7c4803367f5992f6f52e6960b3de3818b3bbd607 (patch)
treea7bea9b3501dd8791ad4af1fb33b6169716e700c /source/blender/bmesh/operators/bmo_removedoubles.c
parentbeaa66bb13a5d801ec10957922b2d90e04ca5d7c (diff)
BMesh: prevent weld-verts bmop creating selected+hidden verts/edges
Related to error exposed by T59640 Would have fixed crash too, but we want to ignore hidden verts.
Diffstat (limited to 'source/blender/bmesh/operators/bmo_removedoubles.c')
-rw-r--r--source/blender/bmesh/operators/bmo_removedoubles.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/bmesh/operators/bmo_removedoubles.c b/source/blender/bmesh/operators/bmo_removedoubles.c
index 8468227d17e..a4d67d10806 100644
--- a/source/blender/bmesh/operators/bmo_removedoubles.c
+++ b/source/blender/bmesh/operators/bmo_removedoubles.c
@@ -202,7 +202,7 @@ void bmo_weld_verts_exec(BMesh *bm, BMOperator *op)
BMO_vert_flag_enable(bm, v1, ELE_DEL);
/* merge the vertex flags, else we get randomly selected/unselected verts */
- BM_elem_flag_merge(v1, v2);
+ BM_elem_flag_merge_ex(v1, v2, BM_ELEM_HIDDEN);
}
}
@@ -231,7 +231,7 @@ void bmo_weld_verts_exec(BMesh *bm, BMOperator *op)
if (e_new == NULL) {
e_new = BM_edge_create(bm, v1, v2, e, BM_CREATE_NOP);
}
- BM_elem_flag_merge(e_new, e);
+ BM_elem_flag_merge_ex(e_new, e, BM_ELEM_HIDDEN);
}
BMO_edge_flag_enable(bm, e, ELE_DEL);