[Bf-blender-cvs] [0c9607312f8] master: Undo: don't log an error when the undo limit has been exceeded

Campbell Barton noreply at git.blender.org
Fri Feb 26 06:33:16 CET 2021


Commit: 0c9607312f83fa3bbbabe245e97dbc96665f6e70
Author: Campbell Barton
Date:   Fri Feb 26 16:30:07 2021 +1100
Branches: master
https://developer.blender.org/rB0c9607312f83fa3bbbabe245e97dbc96665f6e70

Undo: don't log an error when the undo limit has been exceeded

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

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 bb871e84c7b..52f0fe3f5a2 100644
--- a/source/blender/blenkernel/intern/undo_system.c
+++ b/source/blender/blenkernel/intern/undo_system.c
@@ -768,10 +768,13 @@ bool BKE_undosys_step_load_data_ex(UndoStack *ustack,
     while (us_target_active != NULL && us_target_active->skip) {
       us_target_active = (undo_dir == -1) ? us_target_active->prev : us_target_active->next;
     }
-  }
-  if (us_target_active == NULL) {
-    CLOG_ERROR(&LOG, "could not find a valid final active target step");
-    return false;
+    if (us_target_active == NULL) {
+      CLOG_INFO(&LOG,
+                2,
+                "undo/redo did not find a step after stepping over skip-steps "
+                "(undo limit exceeded)");
+      return false;
+    }
   }
 
   CLOG_INFO(&LOG,



More information about the Bf-blender-cvs mailing list