blender
/
blender
132
398
Fork 577
Code Issues 6.2k Pull Requests 750 Projects 19 Wiki Activity

Fix auto-merge loosing edge/faces selection

This commit is contained in:
Campbell Barton 2015-12-01 22:09:45 +11:00
parent d9f5a4ed79
commit b2e36dcd7d
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
source/blender/bmesh/operators/bmo_removedoubles.c
View File

@ -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);
}

4
source/blender/editors/transform/transform_conversions.c
View File

@ -5942,6 +5942,10 @@ static void special_aftertrans_update__mesh(bContext *UNUSED(C), TransInfo *t)
}
EDBM_automerge(t->scene, t->obedit, true, hflag);
if ((em->selectmode & SCE_SELECT_VERTEX) == 0) {
EDBM_select_flush(em);
}
}
}