[Bf-blender-cvs] [9812943931b] master: WM: check modal handlers for keymap lookups

Campbell Barton noreply at git.blender.org
Fri May 25 10:51:48 CEST 2018


Commit: 9812943931b06a078945820abff381dfe4a020cf
Author: Campbell Barton
Date:   Fri May 25 10:51:05 2018 +0200
Branches: master
https://developer.blender.org/rB9812943931b06a078945820abff381dfe4a020cf

WM: check modal handlers for keymap lookups

Keep in sync with 2.8x

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

M	source/blender/windowmanager/intern/wm_keymap.c

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

diff --git a/source/blender/windowmanager/intern/wm_keymap.c b/source/blender/windowmanager/intern/wm_keymap.c
index 39dd26339eb..6a5b638437e 100644
--- a/source/blender/windowmanager/intern/wm_keymap.c
+++ b/source/blender/windowmanager/intern/wm_keymap.c
@@ -1190,8 +1190,14 @@ static wmKeyMapItem *wm_keymap_item_find_props(
 	wmKeyMapItem *found = NULL;
 
 	/* look into multiple handler lists to find the item */
-	if (win)
-		found = wm_keymap_item_find_handlers(C, &win->handlers, opname, opcontext, properties, is_strict, is_hotkey, r_keymap);
+	if (win) {
+		found = wm_keymap_item_find_handlers(
+		        C, &win->modalhandlers, opname, opcontext, properties, is_strict, is_hotkey, r_keymap);
+		if (found == NULL) {
+			found = wm_keymap_item_find_handlers(
+			        C, &win->handlers, opname, opcontext, properties, is_strict, is_hotkey, r_keymap);
+		}
+	}
 
 	if (sa && found == NULL)
 		found = wm_keymap_item_find_handlers(C, &sa->handlers, opname, opcontext, properties, is_strict, is_hotkey, r_keymap);



More information about the Bf-blender-cvs mailing list