[Bf-blender-cvs] [c11be0f7363] blender-v2.80-release: Revert "Fix T67040: Undo crashes after renaming"

Brecht Van Lommel noreply at git.blender.org
Wed Jul 24 16:28:57 CEST 2019


Commit: c11be0f7363b8f3f8733740bcb5155aadc56ce15
Author: Brecht Van Lommel
Date:   Sun Jul 21 12:59:36 2019 +0200
Branches: blender-v2.80-release
https://developer.blender.org/rBc11be0f7363b8f3f8733740bcb5155aadc56ce15

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 8ea5b47de5f..e2463527fdd 100644
--- a/source/blender/blenkernel/intern/undo_system.c
+++ b/source/blender/blenkernel/intern/undo_system.c
@@ -432,7 +432,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;
       }
     }



More information about the Bf-blender-cvs mailing list