blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 763 Projects 19 Wiki Activity

Fix T85124: Undo assert changing property in redo panel. 

Logical mistake in recent refactor (rB2a8122fb65c5).
This commit is contained in:
Bastien Montagne 2021-01-28 11:32:51 +01:00
parent 573bda1fae
commit 3b66f40d40
Notes: blender-bot 2023-02-14 06:32:27 +01:00 
Referenced by issue #85124, Undo assert changing property in redo panel
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/editors/undo/ed_undo.c
View File

@ -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,