[Bf-blender-cvs] [f5c72467176] master: Fix wrong operator return values in Outliner code.

Bastien Montagne noreply at git.blender.org
Fri Dec 11 11:07:36 CET 2020


Commit: f5c72467176c1f5e8922c86c697e58861cf782a4
Author: Bastien Montagne
Date:   Fri Dec 11 11:05:28 2020 +0100
Branches: master
https://developer.blender.org/rBf5c72467176c1f5e8922c86c697e58861cf782a4

Fix wrong operator return values in Outliner code.

Mistakes in rBac8b641b77e0 and rBf254f66587f2.

Spotted while inverstigating T83592.

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

M	source/blender/editors/space_outliner/outliner_tools.c

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

diff --git a/source/blender/editors/space_outliner/outliner_tools.c b/source/blender/editors/space_outliner/outliner_tools.c
index 159a4616ba7..098a0edb614 100644
--- a/source/blender/editors/space_outliner/outliner_tools.c
+++ b/source/blender/editors/space_outliner/outliner_tools.c
@@ -2791,7 +2791,7 @@ static int do_outliner_operation_event(bContext *C,
     }
     if (datalevel == TSE_ID_BASE) {
       /* do nothing... there are no ops needed here yet */
-      return 0;
+      return OPERATOR_CANCELLED;
     }
     if (datalevel == TSE_CONSTRAINT) {
       return outliner_operator_menu(C, "OUTLINER_OT_constraint_operation");
@@ -2802,7 +2802,7 @@ static int do_outliner_operation_event(bContext *C,
     return outliner_operator_menu(C, "OUTLINER_OT_data_operation");
   }
 
-  return 0;
+  return OPERATOR_CANCELLED;
 }
 
 static int outliner_operation(bContext *C, wmOperator *op, const wmEvent *event)



More information about the Bf-blender-cvs mailing list