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

[Ton Roosendaal]

Revision: 56142
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56142
Author:   ton
Date:     2013-04-18 14:55:04 +0000 (Thu, 18 Apr 2013)
Log Message:
-----------
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.

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-04-18 13:30:41 UTC (rev 56141)
+++ trunk/blender/source/blender/windowmanager/intern/wm_event_system.c	2013-04-18 14:55:04 UTC (rev 56142)
@@ -1370,9 +1370,10 @@
 	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;
 }