[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52508] trunk/blender/source/blender/ windowmanager/intern/wm_event_system.c: Fix #33271: Box tool delay

[Sergey Sharybin]

Revision: 52508
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52508
Author:   nazgul
Date:     2012-11-23 10:00:15 +0000 (Fri, 23 Nov 2012)
Log Message:
-----------
Fix #33271: Box tool delay

Issue was introduced in svn rev51808 which was a fix for #33038

One of changes in that patch lead to a situation that if some keymap don't have
modifier key it wouldn't be triggered in cases modifier key was pressed.

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51808

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	2012-11-23 09:22:34 UTC (rev 52507)
+++ trunk/blender/source/blender/windowmanager/intern/wm_event_system.c	2012-11-23 10:00:15 UTC (rev 52508)
@@ -1310,7 +1310,8 @@
 	if (kmi->oskey != KM_ANY)
 		if (winevent->oskey != kmi->oskey && !(winevent->oskey & kmi->oskey)) return 0;
 	
-	if (winevent->keymodifier != kmi->keymodifier) return 0;
+	if (kmi->keymodifier)
+		if (winevent->keymodifier != kmi->keymodifier) return 0;
 		
 	
 	return 1;