From 8bdac377d85a74a0a84eda51fbcc927ae4ad54b3 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 7 Jan 2020 14:36:49 +1100 Subject: BMesh: remove BMEditMesh.ob use for undo --- source/blender/editors/mesh/editmesh_undo.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'source/blender/editors/mesh') 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); } -- cgit v1.2.3