projects
/
blender-staging.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
2.5
[blender-staging.git]
/
source
/
blender
/
windowmanager
/
intern
/
wm_event_system.c
diff --git
a/source/blender/windowmanager/intern/wm_event_system.c
b/source/blender/windowmanager/intern/wm_event_system.c
index 78c7f7a7383367cb36f454b6469e2842c81fa39c..2a1fc009baac6cfe701f4b4e9f309a5e108bdde5 100644
(file)
--- a/
source/blender/windowmanager/intern/wm_event_system.c
+++ b/
source/blender/windowmanager/intern/wm_event_system.c
@@
-626,6
+626,8
@@
static int wm_eventmatch(wmEvent *winevent, wmKeymapItem *kmi)
{
int kmitype= wm_userdef_event_map(kmi->type);
+ if(kmi->inactive) return 0;
+
/* the matching rules */
if(kmitype==KM_TEXTINPUT)
if(ISKEYBOARD(winevent->type)) return 1;