From 3b66f40d40e4e7fd5d301f88e57c04cd0945dbf0 Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Thu, 28 Jan 2021 11:32:51 +0100 Subject: Fix T85124: Undo assert changing property in redo panel. Logical mistake in recent refactor (rB2a8122fb65c5). --- source/blender/editors/undo/ed_undo.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'source/blender/editors/undo') diff --git a/source/blender/editors/undo/ed_undo.c b/source/blender/editors/undo/ed_undo.c index 883c13f20db..b6001b8b014 100644 --- a/source/blender/editors/undo/ed_undo.c +++ b/source/blender/editors/undo/ed_undo.c @@ -320,8 +320,9 @@ static int ed_undo_step_by_name(bContext *C, const char *undo_name, ReportList * /* Pointers match on redo. */ const int target_step_index = BLI_findindex(&wm->undo_stack->steps, undo_step_from_name); const int active_step_index = BLI_findindex(&wm->undo_stack->steps, wm->undo_stack->step_active); - const enum eUndoStepDir undo_dir = (target_step_index < active_step_index) ? STEP_UNDO : - STEP_REDO; + /* NOTE: when current and target active steps are the same, we are in undo case. */ + const enum eUndoStepDir undo_dir = (target_step_index <= active_step_index) ? STEP_UNDO : + STEP_REDO; CLOG_INFO(&LOG, 1, -- cgit v1.2.3