From 5eaa8bf02d3bf9a531cdd30183800168119d14b6 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 13 Jul 2018 17:37:00 +0200 Subject: Fix bad assert on redo --- source/blender/editors/undo/ed_undo.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'source/blender/editors/undo/ed_undo.c') 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; -- cgit v1.2.3