[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56285] trunk/blender/intern/ghost/intern/ GHOST_SystemWin32.cpp: Fix #29932 Left Shift + Numpad 1, 2, 3 not Aligning to Active

Francisco De La Cruz dlcs.frank at gmail.com
Thu Apr 25 07:32:33 CEST 2013


Revision: 56285
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56285
Author:   xercesblue
Date:     2013-04-25 05:32:32 +0000 (Thu, 25 Apr 2013)
Log Message:
-----------
Fix #29932 Left Shift + Numpad 1,2,3 not Aligning to Active

Intermediate Shift+Key messages were resetting modifier flags.

Modified Paths:
--------------
    trunk/blender/intern/ghost/intern/GHOST_SystemWin32.cpp

Modified: trunk/blender/intern/ghost/intern/GHOST_SystemWin32.cpp
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_SystemWin32.cpp	2013-04-25 00:06:43 UTC (rev 56284)
+++ trunk/blender/intern/ghost/intern/GHOST_SystemWin32.cpp	2013-04-25 05:32:32 UTC (rev 56285)
@@ -607,7 +607,17 @@
 			case VK_GR_LESS:        key = GHOST_kKeyGrLess;         break;
 
 			case VK_SHIFT:
-				key = (scanCode == 0x36) ? GHOST_kKeyRightShift : GHOST_kKeyLeftShift;
+					/* Check single shift presses */
+					if (scanCode == 0x36) {
+						key = GHOST_kKeyRightShift;
+					} else if (scanCode == 0x2a) {
+						key = GHOST_kKeyLeftShift;
+					} else {
+						/* Must be a combination SHIFT (Left or Right) + a Key 
+						 * Ignore this as the next message will contain
+						 * the desired "Key" */
+						key = GHOST_kKeyUnknown;
+					}
 				break;
 			case VK_CONTROL:
 				key = (extend) ? GHOST_kKeyRightControl : GHOST_kKeyLeftControl;




More information about the Bf-blender-cvs mailing list