diff options
author | Mike Erwin <significant.bit@gmail.com> | 2011-06-19 00:30:09 +0400 |
---|---|---|
committer | Mike Erwin <significant.bit@gmail.com> | 2011-06-19 00:30:09 +0400 |
commit | e46e2d9d5400729da2980cc5b1f2e24df9207c5a (patch) | |
tree | aae648d36296b5fefc1ae9238b7e82ffc5aa37ca /source/blender/windowmanager/wm_event_types.h | |
parent | 412da91a472deeb62574e35908b349b952b4a109 (diff) |
resolved collision among WM event types, ndof no longer encroaches on keyboard turf
Diffstat (limited to 'source/blender/windowmanager/wm_event_types.h')
-rw-r--r-- | source/blender/windowmanager/wm_event_types.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/source/blender/windowmanager/wm_event_types.h b/source/blender/windowmanager/wm_event_types.h index ed500ccd5c5..210dd902b99 100644 --- 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, |