[Bf-blender-cvs] [8bdac377d85] master: BMesh: remove BMEditMesh.ob use for undo

Campbell Barton noreply at git.blender.org
Tue Jan 7 07:50:32 CET 2020


Commit: 8bdac377d85a74a0a84eda51fbcc927ae4ad54b3
Author: Campbell Barton
Date:   Tue Jan 7 14:36:49 2020 +1100
Branches: master
https://developer.blender.org/rB8bdac377d85a74a0a84eda51fbcc927ae4ad54b3

BMesh: remove BMEditMesh.ob use for undo

===================================================================

M	source/blender/editors/mesh/editmesh_undo.c

===================================================================

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);
   }



More information about the Bf-blender-cvs mailing list