[Bf-blender-cvs] [45ae9edbd5a] master: Revert "Fix T67040: Undo crashes after renaming"

Brecht Van Lommel noreply at git.blender.org
Sun Jul 21 13:02:51 CEST 2019


Commit: 45ae9edbd5ac836619b02c5b9d05efbf0f2c8d1d
Author: Brecht Van Lommel
Date:   Sun Jul 21 12:59:36 2019 +0200
Branches: master
https://developer.blender.org/rB45ae9edbd5ac836619b02c5b9d05efbf0f2c8d1d

Revert "Fix T67040: Undo crashes after renaming"

This reverts commit c635663e4a8169f68010b9234fa60f17ad03d7cb. This is causing
crashes with sculpt mode and object mode switching.

Fixes T67217.

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

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 2d0a482d223..d312dc0190b 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_exclude->type != BKE_UNDOSYS_TYPE_MEMFILE) {
+      while (us_exclude && us->type != BKE_UNDOSYS_TYPE_MEMFILE) {
         us_exclude = us_exclude->prev;
       }
       if (us_exclude) {



More information about the Bf-blender-cvs mailing list