From 65b1ace941eecaa29e22fb4945524ad9ecd59c4d Mon Sep 17 00:00:00 2001 From: Joshua Leung Date: Mon, 3 Feb 2014 19:23:17 +1300 Subject: Fix T38447: Deactivated hotkeys are still showing in menu --- source/blender/windowmanager/intern/wm_keymap.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to '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 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) { -- cgit v1.2.3