diff options
author | Campbell Barton <ideasman42@gmail.com> | 2015-12-01 14:09:45 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2015-12-01 14:12:12 +0300 |
commit | b2e36dcd7db55fada5c500e95a0a1c9c9ab82fcb (patch) | |
tree | bcd949fc87aa23ec1ce15072b77fb3ee91875a1a /source/blender/bmesh/operators/bmo_removedoubles.c | |
parent | d9f5a4ed79a58f90db221194a8a5e7f9574c62f8 (diff) |
Fix auto-merge loosing edge/faces selection
Diffstat (limited to 'source/blender/bmesh/operators/bmo_removedoubles.c')
-rw-r--r-- | source/blender/bmesh/operators/bmo_removedoubles.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/source/blender/bmesh/operators/bmo_removedoubles.c b/source/blender/bmesh/operators/bmo_removedoubles.c index 42373ad0ef0..5d9852d1c68 100644 --- a/source/blender/bmesh/operators/bmo_removedoubles.c +++ b/source/blender/bmesh/operators/bmo_removedoubles.c @@ -126,6 +126,21 @@ static void remdoubles_createface(BMesh *bm, BMFace *f, BMOpSlot *slot_targetmap continue; } + /* low level selection, not essential but means we can keep + * edge selection valid on auto-merge for example. */ + if ((BM_elem_flag_test(l->e, BM_ELEM_SELECT) == true) && + (BM_elem_flag_test(e_new, BM_ELEM_SELECT) == false)) + { + BM_elem_flag_disable(l->e, BM_ELEM_SELECT); + BM_elem_flag_merge_into(e_new, e_new, l->e); + BM_elem_flag_enable(e_new, BM_ELEM_SELECT); + /* bm->totedgesel remains valid */ + } + else { + BM_elem_flag_merge_into(e_new, e_new, l->e); + } + + STACK_PUSH(edges, e_new); STACK_PUSH(loops, l); } |