diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-05-25 11:52:53 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-05-25 11:52:53 +0300 |
| commit | 08da2826e0f29a6a43b60deb3b31dac8dba22e6d (patch) | |
| tree | 351b3a5c748566aa07641882a443298a1fec2da5 /source/blender/windowmanager/intern/wm_keymap.c | |
| parent | 230943be2d0bb8cc508f0938003597249a9ddebb (diff) | |
| parent | 9812943931b06a078945820abff381dfe4a020cf (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/windowmanager/intern/wm_keymap.c')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_keymap.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/windowmanager/intern/wm_keymap.c b/source/blender/windowmanager/intern/wm_keymap.c index 9d26c7e92d5..f2387846fd2 100644 --- a/source/blender/windowmanager/intern/wm_keymap.c +++ b/source/blender/windowmanager/intern/wm_keymap.c @@ -1215,9 +1215,11 @@ static wmKeyMapItem *wm_keymap_item_find_props( /* look into multiple handler lists to find the item */ if (win) { - found = wm_keymap_item_find_handlers(C, &win->modalhandlers, opname, opcontext, properties, is_strict, is_hotkey, r_keymap); + 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); + found = wm_keymap_item_find_handlers( + C, &win->handlers, opname, opcontext, properties, is_strict, is_hotkey, r_keymap); } } |