diff options
| author | Ton Roosendaal <ton@blender.org> | 2013-05-02 19:10:24 +0400 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2013-05-02 19:10:24 +0400 |
| commit | 12db4f3eae0981607d5fe35007ef134687b19b95 (patch) | |
| tree | 4d281c57a5a213bb3821fd721953a666605b01c8 | |
| parent | 4a4f091155e7fb1c7eba0988c815b41665e045b6 (diff) | |
Revert fix for #34822
Allowing any-key modifiers to work is cool, but this needs more work.
My previous fix made overlapping key presses (where you release key 1
just after pressing key 2) to not register as valid shortcuts.
| -rw-r--r-- | source/blender/windowmanager/intern/wm_event_system.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c index e104da6c067..f79ac1c9083 100644 --- a/source/blender/windowmanager/intern/wm_event_system.c +++ b/source/blender/windowmanager/intern/wm_event_system.c @@ -1384,9 +1384,9 @@ static int wm_eventmatch(wmEvent *winevent, wmKeyMapItem *kmi) if (kmi->oskey != KM_ANY) if (winevent->oskey != kmi->oskey && !(winevent->oskey & kmi->oskey)) return 0; - /* key modifiers always check when event has it */ - /* otherwise regular keypresses with keymodifier still work */ - if (winevent->keymodifier || kmi->keymodifier) + /* only keymap entry with keymodifier is checked, means all keys without modifier get handled too. */ + /* that is currently needed to make overlapping events work (when you press A - G fast or so). */ + if (kmi->keymodifier) if (winevent->keymodifier != kmi->keymodifier) return 0; return 1; |