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/makesrna/intern/rna_wm.c | |
| 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/makesrna/intern/rna_wm.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_wm.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/source/blender/makesrna/intern/rna_wm.c b/source/blender/makesrna/intern/rna_wm.c index 6902c379b59..f97f194033c 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} |