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>2018-07-13 18:37:00 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-07-13 18:37:00 +0300
commit5eaa8bf02d3bf9a531cdd30183800168119d14b6 (patch)
tree9f17b60f9169c4a57c501ff4b4ee788ddea2004f /source/blender/editors/undo/ed_undo.c
parent4705682151b19fbaa5cccd85cbc8b0d00f743e30 (diff)
Fix bad assert on redo
Diffstat (limited to 'source/blender/editors/undo/ed_undo.c')
-rw-r--r--source/blender/editors/undo/ed_undo.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/editors/undo/ed_undo.c b/source/blender/editors/undo/ed_undo.c
index 7bbb2479a52..b604b1db56f 100644
--- a/source/blender/editors/undo/ed_undo.c
+++ b/source/blender/editors/undo/ed_undo.c
@@ -131,8 +131,9 @@ static int ed_undo_step(bContext *C, int step, const char *undoname)
return OPERATOR_CANCELLED;
}
- /* TODO(campbell), could use simple optimization. */
- BLI_assert(step_data_from_name != wm->undo_stack->step_active);
+ /* happens on redo. */
+ // BLI_assert(step_data_from_name != wm->undo_stack->step_active);
+ /* TODO(campbell): could use simple optimization. */
step_for_callback = (
BLI_findindex(&wm->undo_stack->steps, step_data_from_name) <
BLI_findindex(&wm->undo_stack->steps, wm->undo_stack->step_active)) ? 1 : -1;