From 58a00e7396ca9e01254eb6015bb74cac1bc26a97 Mon Sep 17 00:00:00 2001 From: Ton Roosendaal Date: Thu, 18 Apr 2013 14:55:04 +0000 Subject: [PATCH] Bug fix #34822 Tiny tweak in "Any key modifier" code. It now refuses to accept events when you hold any key, and then press another key - unless that has key-modifier set. This enables Houdini style "Hold Spacebar - Leftmouse" view moves. --- source/blender/windowmanager/intern/wm_event_system.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c index 82ad87ed3b0..fcacfbbb686 100644 --- a/source/blender/windowmanager/intern/wm_event_system.c +++ b/source/blender/windowmanager/intern/wm_event_system.c @@ -1370,9 +1370,10 @@ static int wm_eventmatch(wmEvent *winevent, wmKeyMapItem *kmi) if (kmi->oskey != KM_ANY) if (winevent->oskey != kmi->oskey && !(winevent->oskey & kmi->oskey)) return 0; - if (kmi->keymodifier) + /* key modifiers always check when event has it */ + /* otherwise regular keypresses with keymodifier still work */ + if (winevent->keymodifier || kmi->keymodifier) if (winevent->keymodifier != kmi->keymodifier) return 0; - return 1; }