diff options
| author | Joshua Leung <aligorith@gmail.com> | 2014-02-03 10:23:17 +0400 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2014-02-03 10:23:50 +0400 |
| commit | 65b1ace941eecaa29e22fb4945524ad9ecd59c4d (patch) | |
| tree | b53654b7e7fb9d0fce39e34f8f78ff88d899b5bb /source/blender/windowmanager/intern/wm_keymap.c | |
| parent | b320139c674325c802b75a136f346d2cf83730da (diff) | |
Fix T38447: Deactivated hotkeys are still showing in menu
Diffstat (limited to 'source/blender/windowmanager/intern/wm_keymap.c')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_keymap.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/windowmanager/intern/wm_keymap.c b/source/blender/windowmanager/intern/wm_keymap.c index 7caa5b31df4..c925a20c9d5 100644 --- a/source/blender/windowmanager/intern/wm_keymap.c +++ b/source/blender/windowmanager/intern/wm_keymap.c @@ -941,11 +941,15 @@ static wmKeyMapItem *wm_keymap_item_find_handlers( if (keymap && (!keymap->poll || keymap->poll((bContext *)C))) { for (kmi = keymap->items.first; kmi; kmi = kmi->next) { + /* skip disabled keymap items [T38447] */ + if (kmi->flag & KMI_INACTIVE) + continue; if (strcmp(kmi->idname, opname) == 0 && WM_key_event_string(kmi->type)[0]) { - if (is_hotkey) + if (is_hotkey) { if (!ISHOTKEY(kmi->type)) continue; + } if (properties) { |