[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51734] trunk/blender/source/blender/ windowmanager/intern/wm_event_system.c: Fix to make NDoF work again.

Ton Roosendaal ton at blender.org
Mon Oct 29 16:40:44 CET 2012


Revision: 51734
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51734
Author:   ton
Date:     2012-10-29 15:40:43 +0000 (Mon, 29 Oct 2012)
Log Message:
-----------
Fix to make NDoF work again.

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-10-29 15:31:48 UTC (rev 51733)
+++ trunk/blender/source/blender/windowmanager/intern/wm_event_system.c	2012-10-29 15:40:43 UTC (rev 51734)
@@ -2818,11 +2818,10 @@
 			else
 				event.type = MIDDLEMOUSE;
 			
-			/* copy prev state to event state */
-//			if (event.val == KM_PRESS) {
-				evt->prevval = evt->val;
-				evt->prevtype = evt->type;
-//			}
+			/* copy previous state to prev event state (two old!) */
+			evt->prevval = evt->val;
+			evt->prevtype = evt->type;
+
 			/* copy to event state */
 			evt->val = event.val;
 			evt->type = event.type;
@@ -2883,11 +2882,9 @@
 			memcpy(event.utf8_buf, kd->utf8_buf, sizeof(event.utf8_buf)); /* might be not null terminated*/
 			event.val = (type == GHOST_kEventKeyDown) ? KM_PRESS : KM_RELEASE;
 			
-			/* copy prev state to event state */
-			//if (event.val == KM_PRESS) {
-				evt->prevval = evt->val;
-				evt->prevtype = evt->type;
-			//}
+			/* copy previous state to prev event state (two old!) */
+			evt->prevval = evt->val;
+			evt->prevtype = evt->type;
 
 			/* copy to event state */
 			evt->val = event.val;
@@ -3015,6 +3012,7 @@
 		case GHOST_kEventNDOFMotion:
 		{
 			event.type = NDOF_MOTION;
+			event.val = 0;
 			attach_ndof_data(&event, customdata);
 			wm_event_add(win, &event);
 




More information about the Bf-blender-cvs mailing list