[Bf-blender-cvs] [6249995c5eb] master: Fix T85054: undo/redo app handlers broken

Falk David noreply at git.blender.org
Mon Jan 25 23:19:26 CET 2021


Commit: 6249995c5ebb65127daae6fa235b7db9d26c9950
Author: Falk David
Date:   Tue Jan 26 09:15:09 2021 +1100
Branches: master
https://developer.blender.org/rB6249995c5ebb65127daae6fa235b7db9d26c9950

Fix T85054: undo/redo app handlers broken

Regression in recent commit c13383da416c9c99d03058caaf66c736af0272cb
which swapped undo/redo when calling the handlers.

Ref D10200

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

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 860eaa37816..723e92b9d09 100644
--- a/source/blender/editors/undo/ed_undo.c
+++ b/source/blender/editors/undo/ed_undo.c
@@ -252,7 +252,7 @@ static int ed_undo_step_impl(bContext *C,
     Main *bmain = CTX_data_main(C);
     wm->op_undo_depth++;
     BKE_callback_exec_id(
-        bmain, &scene->id, (step_for_callback > 0) ? BKE_CB_EVT_UNDO_PRE : BKE_CB_EVT_REDO_PRE);
+        bmain, &scene->id, (step_for_callback == STEP_UNDO) ? BKE_CB_EVT_UNDO_PRE : BKE_CB_EVT_REDO_PRE);
     wm->op_undo_depth--;
   }
 
@@ -301,7 +301,7 @@ static int ed_undo_step_impl(bContext *C,
     scene = CTX_data_scene(C);
     wm->op_undo_depth++;
     BKE_callback_exec_id(
-        bmain, &scene->id, step_for_callback > 0 ? BKE_CB_EVT_UNDO_POST : BKE_CB_EVT_REDO_POST);
+        bmain, &scene->id, (step_for_callback == STEP_UNDO) ? BKE_CB_EVT_UNDO_POST : BKE_CB_EVT_REDO_POST);
     wm->op_undo_depth--;
   }



More information about the Bf-blender-cvs mailing list