[Bf-blender-cvs] [33fbf9b] master: Fix broken keymap loading with disabled ndof - revert part of recent rBb10d0058d72da30

[Bastien Montagne]

Commit: 33fbf9b7e0a3f7e1e78cd94c5dcaff1e0c562e6a
Author: Bastien Montagne
Date:   Fri Aug 19 15:51:44 2016 +0200
Branches: master
https://developer.blender.org/rB33fbf9b7e0a3f7e1e78cd94c5dcaff1e0c562e6a

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).

===================================================================

M	source/blender/makesrna/intern/rna_wm.c
M	source/blender/windowmanager/wm_event_types.h

===================================================================

diff --git a/source/blender/makesrna/intern/rna_wm.c b/source/blender/makesrna/intern/rna_wm.c
index 6902c37..f97f194 100644
--- a/source/blender/makesrna/intern/rna_wm.c
+++ b/source/blender/makesrna/intern/rna_wm.c
@@ -118,7 +118,6 @@ static EnumPropertyItem event_textinput_type_items[] = {
 	{0, NULL, 0, NULL, NULL}
 };
 
-#ifdef WITH_INPUT_NDOF
 static EnumPropertyItem event_ndof_type_items[] = {
 	{NDOF_MOTION, "NDOF_MOTION", 0, "Motion", ""},
 	/* buttons on all 3dconnexion devices */
@@ -168,7 +167,6 @@ static EnumPropertyItem event_ndof_type_items[] = {
 	{NDOF_BUTTON_C, "NDOF_BUTTON_C", 0, "Button C", ""},
 	{0, NULL, 0, NULL, NULL}
 };
-#endif /* WITH_INPUT_NDOF */
 #endif /* RNA_RUNTIME */
 
 /* not returned: CAPSLOCKKEY, UNKNOWNKEY */
@@ -334,7 +332,6 @@ EnumPropertyItem rna_enum_event_type_items[] = {
 	{TIMERREPORT, "TIMER_REPORT", 0, "Timer Report", "TmrReport"},
 	{TIMERREGION, "TIMERREGION", 0, "Timer Region", "TmrReg"},
 	{0, "", 0, NULL, NULL},
-#ifdef WITH_INPUT_NDOF
 	{NDOF_MOTION, "NDOF_MOTION", 0, "NDOF Motion", "NdofMov"},
 	/* buttons on all 3dconnexion devices */
 	{NDOF_BUTTON_MENU, "NDOF_BUTTON_MENU", 0, "NDOF Menu", "NdofMenu"},
@@ -381,7 +378,6 @@ EnumPropertyItem rna_enum_event_type_items[] = {
 	{NDOF_BUTTON_A, "NDOF_BUTTON_A", 0, "NDOF Button A", "NdofBA"},
 	{NDOF_BUTTON_B, "NDOF_BUTTON_B", 0, "NDOF Button B", "NdofBB"},
 	{NDOF_BUTTON_C, "NDOF_BUTTON_C", 0, "NDOF Button C", "NdofBC"},
-#endif /* WITH_INPUT_NDOF */
 	{0, NULL, 0, NULL, NULL}
 };
 
@@ -705,12 +701,10 @@ static void rna_wmKeyMapItem_map_type_set(PointerRNA *ptr, int value)
 				kmi->type = TIMER;
 				kmi->val = KM_NOTHING;
 				break;
-#ifdef WITH_INPUT_NDOF
 			case KMI_TYPE_NDOF:
 				kmi->type = NDOF_MOTION;
 				kmi->val = KM_NOTHING;
 				break;
-#endif
 		}
 	}
 }
@@ -744,9 +738,7 @@ static EnumPropertyItem *rna_KeyMapItem_type_itemf(bContext *UNUSED(C), PointerR
 	if (map_type == KMI_TYPE_MOUSE) return event_mouse_type_items;
 	if (map_type == KMI_TYPE_TWEAK) return event_tweak_type_items;
 	if (map_type == KMI_TYPE_TIMER) return event_timer_type_items;
-#ifdef WITH_INPUT_NDOF
 	if (map_type == KMI_TYPE_NDOF) return event_ndof_type_items;
-#endif
 	if (map_type == KMI_TYPE_TEXTINPUT) return event_textinput_type_items;
 	else return rna_enum_event_type_items;
 }
@@ -2022,9 +2014,7 @@ static void rna_def_keyconfig(BlenderRNA *brna)
 		{KMI_TYPE_KEYBOARD, "KEYBOARD", 0, "Keyboard", ""},
 		{KMI_TYPE_TWEAK, "TWEAK", 0, "Tweak", ""},
 		{KMI_TYPE_MOUSE, "MOUSE", 0, "Mouse", ""},
-#ifdef WITH_INPUT_NDOF
 		{KMI_TYPE_NDOF, "NDOF", 0, "NDOF", ""},
-#endif
 		{KMI_TYPE_TEXTINPUT, "TEXTINPUT", 0, "Text Input", ""},
 		{KMI_TYPE_TIMER, "TIMER", 0, "Timer", ""},
 		{0, NULL, 0, NULL, NULL}
diff --git a/source/blender/windowmanager/wm_event_types.h b/source/blender/windowmanager/wm_event_types.h
index 0936b29..3085f13 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)                                                  \