[Bf-blender-cvs] [3b66f40d40e] master: Fix T85124: Undo assert changing property in redo panel.

Bastien Montagne noreply at git.blender.org
Thu Jan 28 11:33:42 CET 2021


Commit: 3b66f40d40e4e7fd5d301f88e57c04cd0945dbf0
Author: Bastien Montagne
Date:   Thu Jan 28 11:32:51 2021 +0100
Branches: master
https://developer.blender.org/rB3b66f40d40e4e7fd5d301f88e57c04cd0945dbf0

Fix T85124: Undo assert changing property in redo panel.

Logical mistake in recent refactor (rB2a8122fb65c5).

===================================================================

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



More information about the Bf-blender-cvs mailing list