diff options
author | Campbell Barton <ideasman42@gmail.com> | 2020-01-07 14:11:19 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2020-01-07 14:14:36 +0300 |
commit | c128b30bd13bbf48a701fe068fa27c1d21378515 (patch) | |
tree | d7cb94213e72d823bfa41f336a67fbaf947efbc7 /source/blender/editors/mesh/editmesh_automerge.c | |
parent | cb1f48ab7f5024715a898b767576ce4258098516 (diff) |
Edit Mesh: pass in Mesh instead of BMEditMesh to EDBM_update_generic
This avoids a list lookup in Main (recently added), passing in a mesh
instead of an edit-mesh, since the mesh links to the edit-mesh.
Diffstat (limited to 'source/blender/editors/mesh/editmesh_automerge.c')
-rw-r--r-- | source/blender/editors/mesh/editmesh_automerge.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/mesh/editmesh_automerge.c b/source/blender/editors/mesh/editmesh_automerge.c index 55b52e01fc3..ffde9f338b4 100644 --- a/source/blender/editors/mesh/editmesh_automerge.c +++ b/source/blender/editors/mesh/editmesh_automerge.c @@ -79,7 +79,7 @@ void EDBM_automerge(Object *obedit, bool update, const char hflag, const float d BMO_op_finish(bm, &weldop); if ((totvert_prev != bm->totvert) && update) { - EDBM_update_generic(em, true, true); + EDBM_update_generic(obedit->data, true, true); } } @@ -189,7 +189,7 @@ void EDBM_automerge_and_split(Object *obedit, #endif if (LIKELY(ok) && update) { - EDBM_update_generic(em, true, true); + EDBM_update_generic(obedit->data, true, true); } } |