diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-09-02 17:32:02 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-09-02 17:35:22 +0300 |
commit | a3559a70dd57110fd4e1cc568928ee1e3504959a (patch) | |
tree | 8beced38137ff9a86aebb30c4848891695cc80ca /source/blender/editors/mesh/editmesh_tools.c | |
parent | 2356f60c6200188a2f88d6d890ff78fa8fd2b4d3 (diff) |
Fix T69404: Merge by distance crash with Unselected
Error introduced when removing the automerge bmesh operator.
Diffstat (limited to 'source/blender/editors/mesh/editmesh_tools.c')
-rw-r--r-- | source/blender/editors/mesh/editmesh_tools.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c index b88b6cbb3a6..e5023068100 100644 --- a/source/blender/editors/mesh/editmesh_tools.c +++ b/source/blender/editors/mesh/editmesh_tools.c @@ -3131,12 +3131,7 @@ static int edbm_remove_doubles_exec(bContext *C, wmOperator *op) BM_mesh_elem_hflag_enable_test(em->bm, htype_select, BM_ELEM_TAG, true, true, BM_ELEM_SELECT); if (use_unselected) { - EDBM_op_init(em, &bmop, op, "automerge verts=%hv dist=%f", BM_ELEM_SELECT, threshold); - BMO_op_exec(em->bm, &bmop); - - if (!EDBM_op_finish(em, &bmop, op, true)) { - continue; - } + EDBM_automerge(obedit, false, BM_ELEM_SELECT, threshold); } else { EDBM_op_init(em, &bmop, op, "find_doubles verts=%hv dist=%f", BM_ELEM_SELECT, threshold); |