diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-08-19 16:51:44 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-08-19 16:51:44 +0300 |
| commit | 33fbf9b7e0a3f7e1e78cd94c5dcaff1e0c562e6a (patch) | |
| tree | ce4b6e05dfa7958c22d5cbd5409d744b736841bc /source/blender/windowmanager/wm_event_types.h | |
| parent | 793900d46c4caa695074bbaf9c467c0b0659f5cd (diff) | |
Fix broken keymap loading with disabled ndof - revert part of recent rBb10d0058d72da30
ifdef’ing out defines in DNA/RNA is not a good idea, was breaking alternative keymaps loading
from splash screen e.g. (reported by Sergey over IRC, thanks).
Diffstat (limited to 'source/blender/windowmanager/wm_event_types.h')
| -rw-r--r-- | source/blender/windowmanager/wm_event_types.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/source/blender/windowmanager/wm_event_types.h b/source/blender/windowmanager/wm_event_types.h index 0936b294d1b..3085f138846 100644 --- a/source/blender/windowmanager/wm_event_types.h +++ b/source/blender/windowmanager/wm_event_types.h @@ -40,9 +40,7 @@ enum { EVT_DATA_GESTURE = 1, EVT_DATA_TIMER = 2, EVT_DATA_DRAGDROP = 3, -#ifdef WITH_INPUT_NDOF EVT_DATA_NDOF_MOTION = 4, -#endif }; /* tablet active, matches GHOST_TTabletMode */ @@ -238,7 +236,6 @@ enum { /* *** End of keyboard codes. *** */ -#ifdef WITH_INPUT_NDOF /* NDOF (from SpaceNavigator & friends) * These should be kept in sync with GHOST_NDOFManager.h * Ordering matters, exact values do not. */ @@ -293,7 +290,6 @@ enum { NDOF_BUTTON_C, /* the end */ NDOF_LAST, -#endif /* WITH_INPUT_NDOF */ /* ********** End of Input devices. ********** */ @@ -373,12 +369,8 @@ enum { /* test whether the event is tweak event */ #define ISTWEAK(event_type) ((event_type) >= EVT_TWEAK_L && (event_type) <= EVT_GESTURE) -#ifdef WITH_INPUT_NDOF /* test whether the event is a NDOF event */ -# define ISNDOF(event_type) ((event_type) >= NDOF_MOTION && (event_type) < NDOF_LAST) -#else -# define ISNDOF(event_type) false -#endif +#define ISNDOF(event_type) ((event_type) >= NDOF_MOTION && (event_type) < NDOF_LAST) /* test whether event type is acceptable as hotkey, excluding modifiers */ #define ISHOTKEY(event_type) \ |