[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56473] trunk/blender/source/blender/ windowmanager/intern/wm_event_system.c: Revert fix for #34822

[Ton Roosendaal]

Revision: 56473
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56473
Author:   ton
Date:     2013-05-02 15:10:24 +0000 (Thu, 02 May 2013)
Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/blender/source/blender/windowmanager/intern/wm_event_system.c

Modified: trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_event_system.c	2013-05-02 14:42:05 UTC (rev 56472)
+++ trunk/blender/source/blender/windowmanager/intern/wm_event_system.c	2013-05-02 15:10:24 UTC (rev 56473)
@@ -1384,9 +1384,9 @@
 	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;