Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2021-02-26 08:30:07 +0300
committerCampbell Barton <ideasman42@gmail.com>2021-02-26 08:31:11 +0300
commit0c9607312f83fa3bbbabe245e97dbc96665f6e70 (patch)
tree1e218f91290e78018deffa06c58aa653f639ba44
parentc402cfa3085188dabcb7b8576f85d482b3efae1f (diff)
Undo: don't log an error when the undo limit has been exceeded
-rw-r--r--source/blender/blenkernel/intern/undo_system.c11
1 files changed, 7 insertions, 4 deletions
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,