View 3D: the select operator now uses the cancel flag on failure

Needed so mapping selection to click doesn't pass the click event
through to setting the 3D cursor for e.g.

While this doesn't happen with the default key-map, setting selection
to LMB-click would set the 3D cursor as well (when the selection
fell through to nothing).

1 files changed, 9 insertions, 3 deletions

diff --git a/source/blender/windowmanager/intern/wm_operator_utils.c b/source/blender/windowmanager/intern/wm_operator_utils.c
index 5a817075cd5..bde072bf000 100644
--- a/source/blender/windowmanager/intern/wm_operator_utils.c
+++ b/source/blender/windowmanager/intern/wm_operator_utils.c
@@ -32,9 +32,15 @@
 
 int WM_operator_flag_only_pass_through_on_press(int retval, const struct wmEvent *event)
 {
-  if ((event->val != KM_PRESS) &&
-      ((retval & OPERATOR_PASS_THROUGH) && (retval & OPERATOR_FINISHED))) {
-    retval &= ~OPERATOR_PASS_THROUGH;
+  if (event->val != KM_PRESS) {
+    if (retval & OPERATOR_PASS_THROUGH) {
+      /* Operators that use this function should either finish or cancel,
+       * otherwise non-press events will be passed through to other key-map items. */
+      BLI_assert((retval & ~OPERATOR_PASS_THROUGH) != 0);
+      if (retval & (OPERATOR_FINISHED | OPERATOR_CANCELLED)) {
+        retval &= ~OPERATOR_PASS_THROUGH;
+      }
+    }
   }
   return retval;
 }