[Bf-blender-cvs] [c635663e4a8] master: Fix T67040: Undo crashes after renaming

Campbell Barton noreply at git.blender.org
Tue Jul 16 09:21:23 CEST 2019


Commit: c635663e4a8169f68010b9234fa60f17ad03d7cb
Author: Campbell Barton
Date:   Tue Jul 16 17:14:19 2019 +1000
Branches: master
https://developer.blender.org/rBc635663e4a8169f68010b9234fa60f17ad03d7cb

Fix T67040: Undo crashes after renaming

Caused by error keeping the first memfile undo step.

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

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 d312dc0190b..2d0a482d223 100644
--- a/source/blender/blenkernel/intern/undo_system.c
+++ b/source/blender/blenkernel/intern/undo_system.c
@@ -427,7 +427,7 @@ void BKE_undosys_stack_limit_steps_and_memory(UndoStack *ustack, int steps, size
     /* Hack, we need to keep at least one BKE_UNDOSYS_TYPE_MEMFILE. */
     if (us->type != BKE_UNDOSYS_TYPE_MEMFILE) {
       us_exclude = us->prev;
-      while (us_exclude && us->type != BKE_UNDOSYS_TYPE_MEMFILE) {
+      while (us_exclude && us_exclude->type != BKE_UNDOSYS_TYPE_MEMFILE) {
         us_exclude = us_exclude->prev;
       }
       if (us_exclude) {



More information about the Bf-blender-cvs mailing list