[Bf-blender-cvs] [45a03057fa3] master: Fix tool leader-key consuming mouse wheel events

[Campbell Barton]

Commit: 45a03057fa33e043b08027a8353d133948b85ca8
Author: Campbell Barton
Date:   Fri Nov 8 17:41:04 2019 +1100
Branches: master
https://developer.blender.org/rB45a03057fa33e043b08027a8353d133948b85ca8

Fix tool leader-key consuming mouse wheel events

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

M	release/scripts/startup/bl_operators/wm.py

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

diff --git a/release/scripts/startup/bl_operators/wm.py b/release/scripts/startup/bl_operators/wm.py
index d576eaee40d..63aaf1d319a 100644
--- a/release/scripts/startup/bl_operators/wm.py
+++ b/release/scripts/startup/bl_operators/wm.py
@@ -1823,12 +1823,15 @@ class WM_OT_toolbar_prompt(Operator):
         event_type = event.type
         event_value = event.value
 
-        keymap = self._keymap
-
-        if event_type in {'LEFTMOUSE', 'RIGHTMOUSE', 'MIDDLEMOUSE', 'ESC'}:
+        if event_type in {
+                'LEFTMOUSE', 'RIGHTMOUSE', 'MIDDLEMOUSE',
+                'WHEELDOWNMOUSE', 'WHEELUPMOUSE', 'WHEELINMOUSE', 'WHEELOUTMOUSE',
+                'ESC',
+        }:
             context.workspace.status_text_set(None)
             return {'CANCELLED', 'PASS_THROUGH'}
 
+        keymap = self._keymap
         item = keymap.keymap_items.match_event(event)
         if item is not None:
             idname = item.idname