[Bf-blender-cvs] [055863d9c1f] master: Cleanup: minor changes.

Bastien Montagne noreply at git.blender.org
Tue Mar 17 12:10:58 CET 2020


Commit: 055863d9c1f0195765f421b1f87e445dd070ea00
Author: Bastien Montagne
Date:   Tue Mar 17 11:32:52 2020 +0100
Branches: master
https://developer.blender.org/rB055863d9c1f0195765f421b1f87e445dd070ea00

Cleanup: minor changes.

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

M	source/blender/blenkernel/intern/undo_system.c

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

diff --git a/source/blender/blenkernel/intern/undo_system.c b/source/blender/blenkernel/intern/undo_system.c
index 74b322aeab7..30867cc15e9 100644
--- a/source/blender/blenkernel/intern/undo_system.c
+++ b/source/blender/blenkernel/intern/undo_system.c
@@ -163,6 +163,7 @@ static bool undosys_step_encode(bContext *C, Main *bmain, UndoStack *ustack, Und
        * not all members are filled in. */
       us->type->step_foreach_ID_ref(us, undosys_id_ref_store, bmain);
     }
+
 #ifdef WITH_GLOBAL_UNDO_CORRECT_ORDER
     if (us->type == BKE_UNDOSYS_TYPE_MEMFILE) {
       ustack->step_active_memfile = us;
@@ -193,7 +194,7 @@ static void undosys_step_decode(
              * undo step will be correctly resolved, see: T56163. */
             undosys_step_decode(C, bmain, ustack, us_iter, dir, false);
             /* May have been freed on memfile read. */
-            bmain = G.main;
+            bmain = G_MAIN;
           }
           break;
         }



More information about the Bf-blender-cvs mailing list