diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-10-19 07:48:39 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-10-19 07:48:39 +0300 |
commit | 30b1e37e943c319fa80e95cfbb105d62c7d79f37 (patch) | |
tree | 1f070298d5417bf4a375b2a9619ed487a70699f9 /source/blender/editors/mesh | |
parent | 9b5183769b869a4a69488d1fc073f175fa1f1b74 (diff) |
Fix T57295: Edit-mesh modes got out of sync
Diffstat (limited to 'source/blender/editors/mesh')
-rw-r--r-- | source/blender/editors/mesh/editmesh_select.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/editors/mesh/editmesh_select.c b/source/blender/editors/mesh/editmesh_select.c index 270b13bd1d7..1a32a36bdb4 100644 --- a/source/blender/editors/mesh/editmesh_select.c +++ b/source/blender/editors/mesh/editmesh_select.c @@ -980,6 +980,7 @@ static bool unified_findnearest( Base *base_iter = bases[base_index]; Object *obedit = base_iter->object; ED_view3d_viewcontext_init_object(vc, obedit); + BLI_assert(vc->em->selectmode == em->selectmode); ED_view3d_backbuf_validate(vc); BMFace *efa_zbuf = NULL; BMFace *efa_test = EDBM_face_find_nearest_ex(vc, &dist, dist_center_p, true, use_cycle, &efa_zbuf); @@ -2518,6 +2519,7 @@ bool EDBM_selectmode_toggle( for (uint ob_index = 0; ob_index < objects_len; ob_index++) { Object *ob_iter = objects[ob_index]; BMEditMesh *em_iter = BKE_editmesh_from_object(ob_iter); + em_iter->selectmode = ts->selectmode; EDBM_selectmode_set(em_iter); DEG_id_tag_update(ob_iter->data, DEG_TAG_COPY_ON_WRITE | DEG_TAG_SELECT_UPDATE); WM_event_add_notifier(C, NC_GEOM | ND_SELECT, ob_iter->data); |