[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37624] branches/merwin-spacenav/source/ blender/windowmanager/wm_event_types.h: resolved collision among WM event types, ndof no longer encroaches on keyboard turf

[Mike Erwin]

Revision: 37624
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37624
Author:   merwin
Date:     2011-06-18 20:30:09 +0000 (Sat, 18 Jun 2011)
Log Message:
-----------
resolved collision among WM event types, ndof no longer encroaches on keyboard 
turf

Modified Paths:
--------------
    branches/merwin-spacenav/source/blender/windowmanager/wm_event_types.h

Modified: branches/merwin-spacenav/source/blender/windowmanager/wm_event_types.h
===================================================================
--- branches/merwin-spacenav/source/blender/windowmanager/wm_event_types.h      
2011-06-18 19:40:30 UTC (rev 37623)
+++ branches/merwin-spacenav/source/blender/windowmanager/wm_event_types.h      
2011-06-18 20:30:09 UTC (rev 37624)
@@ -78,8 +78,13 @@
 #define WHEELOUTMOUSE  13
 #define INBETWEEN_MOUSEMOVE    17
 
-/* NDOF (from SpaceNavigator & friends) */
-#define NDOF_MOTION 0x12 // keep in sync with GHOST_NDOFManager.h
+
+/* NDOF (from SpaceNavigator & friends)
+   These should be kept in sync with GHOST_NDOFManager.h
+   Ordering matters, exact values do not. */
+
+#define NDOF_MOTION 400
+
 enum {
        // used internally, never sent
        NDOF_BUTTON_NONE = NDOF_MOTION,

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