diff options
Diffstat (limited to 'source/blender/windowmanager/intern/wm_keymap.c')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_keymap.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/source/blender/windowmanager/intern/wm_keymap.c b/source/blender/windowmanager/intern/wm_keymap.c index a643e1c632a..72b26cc6207 100644 --- a/source/blender/windowmanager/intern/wm_keymap.c +++ b/source/blender/windowmanager/intern/wm_keymap.c @@ -1301,17 +1301,12 @@ char *WM_key_event_operator_string( return NULL; } -int WM_key_event_operator_id( +wmKeyMapItem *WM_key_event_operator( const bContext *C, const char *opname, int opcontext, IDProperty *properties, const bool is_hotkey, wmKeyMap **r_keymap) { - wmKeyMapItem *kmi = wm_keymap_item_find(C, opname, opcontext, properties, is_hotkey, true, r_keymap); - - if (kmi) - return kmi->id; - else - return 0; + return wm_keymap_item_find(C, opname, opcontext, properties, is_hotkey, true, r_keymap); } int WM_keymap_item_compare(wmKeyMapItem *k1, wmKeyMapItem *k2) @@ -1867,7 +1862,7 @@ wmKeyMap *WM_keymap_guess_opname(const bContext *C, const char *opname) km = WM_keymap_find_all(C, "NLA Editor", sl->spacetype, 0); break; case SPACE_IMAGE: - km = WM_keymap_find_all(C, "UV Editor", sl->spacetype, 0); + km = WM_keymap_find_all(C, "UV Editor", 0, 0); break; case SPACE_NODE: km = WM_keymap_find_all(C, "Node Editor", sl->spacetype, 0); |