diff options
author | Campbell Barton <ideasman42@gmail.com> | 2020-01-07 06:36:49 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2020-01-07 06:36:49 +0300 |
commit | 8bdac377d85a74a0a84eda51fbcc927ae4ad54b3 (patch) | |
tree | 33e755121148407d62a173edf12d4ceccb9f64aa /source/blender/editors/mesh | |
parent | e95c0fba095dfac38b33b5ad7db36316093e2acf (diff) |
BMesh: remove BMEditMesh.ob use for undo
Diffstat (limited to 'source/blender/editors/mesh')
-rw-r--r-- | source/blender/editors/mesh/editmesh_undo.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/source/blender/editors/mesh/editmesh_undo.c b/source/blender/editors/mesh/editmesh_undo.c index d07ba05de20..db7751af0f0 100644 --- a/source/blender/editors/mesh/editmesh_undo.c +++ b/source/blender/editors/mesh/editmesh_undo.c @@ -560,12 +560,10 @@ static void *undomesh_from_editmesh(UndoMesh *um, BMEditMesh *em, Key *key) return um; } -static void undomesh_to_editmesh(UndoMesh *um, BMEditMesh *em, Mesh *obmesh) +static void undomesh_to_editmesh(UndoMesh *um, Object *ob, BMEditMesh *em, Key *key) { BMEditMesh *em_tmp; - Object *ob = em->ob; BMesh *bm; - Key *key = obmesh->key; #ifdef USE_ARRAY_STORE # ifdef USE_ARRAY_STORE_THREAD @@ -766,7 +764,7 @@ static void mesh_undosys_step_decode( continue; } BMEditMesh *em = me->edit_mesh; - undomesh_to_editmesh(&elem->data, em, obedit->data); + undomesh_to_editmesh(&elem->data, obedit, em, me->key); em->needs_flush_to_id = 1; DEG_id_tag_update(&obedit->id, ID_RECALC_GEOMETRY); } |