[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [21762] branches/blender2.5/blender/source /blender/windowmanager/intern/wm_event_system.c: 2.5

[Ton Roosendaal]

Revision: 21762
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21762
Author:   ton
Date:     2009-07-21 14:19:46 +0200 (Tue, 21 Jul 2009)

Log Message:
-----------
2.5

Overlooked WM event.val usage without checking proper #defines.
My previous commit made all input not work on any modifier key press.

Modified Paths:
--------------
    
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_event_system.c

Modified: 
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_event_system.c
===================================================================
--- 
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_event_system.c
   2009-07-21 12:13:56 UTC (rev 21761)
+++ 
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_event_system.c
   2009-07-21 12:19:46 UTC (rev 21762)
@@ -1472,23 +1472,23 @@
                        
                        /* modifiers */
                        if (event.type==LEFTSHIFTKEY || 
event.type==RIGHTSHIFTKEY) {
-                               event.shift= evt->shift= event.val;
-                               if(event.val && (evt->ctrl || evt->alt || 
evt->oskey))
+                               event.shift= evt->shift= (event.val==KM_PRESS);
+                               if(event.val==KM_PRESS && (evt->ctrl || 
evt->alt || evt->oskey))
                                   event.shift= evt->shift = 3;         // 
define?
                        } 
                        else if (event.type==LEFTCTRLKEY || 
event.type==RIGHTCTRLKEY) {
-                               event.ctrl= evt->ctrl= event.val;
-                               if(event.val && (evt->shift || evt->alt || 
evt->oskey))
+                               event.ctrl= evt->ctrl= (event.val==KM_PRESS);
+                               if(event.val==KM_PRESS && (evt->shift || 
evt->alt || evt->oskey))
                                   event.ctrl= evt->ctrl = 3;           // 
define?
                        } 
                        else if (event.type==LEFTALTKEY || 
event.type==RIGHTALTKEY) {
-                               event.alt= evt->alt= event.val;
-                               if(event.val && (evt->ctrl || evt->shift || 
evt->oskey))
+                               event.alt= evt->alt= (event.val==KM_PRESS);
+                               if(event.val==KM_PRESS && (evt->ctrl || 
evt->shift || evt->oskey))
                                   event.alt= evt->alt = 3;             // 
define?
                        } 
                        else if (event.type==COMMANDKEY) {
-                               event.oskey= evt->oskey= event.val;
-                               if(event.val && (evt->ctrl || evt->alt || 
evt->shift))
+                               event.oskey= evt->oskey= (event.val==KM_PRESS);
+                               if(event.val==KM_PRESS && (evt->ctrl || 
evt->alt || evt->shift))
                                   event.oskey= evt->oskey = 3;         // 
define?
                        }
                        


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs