Fix tool leader-key consuming mouse wheel events
authorCampbell Barton <ideasman42@gmail.com>
Fri, 8 Nov 2019 06:41:04 +0000 (17:41 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 8 Nov 2019 06:41:04 +0000 (17:41 +1100)
release/scripts/startup/bl_operators/wm.py

index d576eaee40d6ad52ac9645063ba1c54701039d85..63aaf1d319a4b210bb59893a717849a64c206b2a 100644 (file)
@@ -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