resolved collision among WM event types, ndof no longer encroaches on keyboard turf

2011-06-18 20:30:09 +00:00
parent 412da91a47
commit e46e2d9d54
1 changed files with 7 additions and 2 deletions
--- a/source/blender/windowmanager/wm_event_types.h
+++ b/source/blender/windowmanager/wm_event_types.h
@@ -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,