diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-08-18 16:13:58 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-08-18 16:18:26 +0300 |
| commit | b4d36c77da7e0e545b61d96d49b8122b2f00003a (patch) | |
| tree | e37ae3babd8b238e3bacaa6ce8321245b55a0eea | |
| parent | 7b78532950f69f82058d462e786e77128744c589 (diff) | |
Two fixes for optional ndof & fix bplayer for that...
Seriuosly, guys... Please always check that kind of changes with and without affected option, and in full build case.
| -rw-r--r-- | source/blender/makesrna/intern/rna_wm.c | 2 | ||||
| -rw-r--r-- | source/blenderplayer/bad_level_call_stubs/CMakeLists.txt | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_wm.c b/source/blender/makesrna/intern/rna_wm.c index ba77e2a1768..1f991b2d11d 100644 --- a/source/blender/makesrna/intern/rna_wm.c +++ b/source/blender/makesrna/intern/rna_wm.c @@ -381,8 +381,8 @@ 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"}, - {0, NULL, 0, NULL, NULL} #endif /* WITH_INPUT_NDOF */ + {0, NULL, 0, NULL, NULL} }; EnumPropertyItem rna_enum_event_value_items[] = { diff --git a/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt b/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt index 1d681d28589..0e570e19258 100644 --- a/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt +++ b/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt @@ -70,4 +70,8 @@ if(WITH_FREESTYLE) add_definitions(-DWITH_FREESTYLE) endif() +if(WITH_INPUT_NDOF) + add_definitions(-DWITH_INPUT_NDOF) +endif() + blender_add_lib_nolist(blenkernel_blc "${SRC}" "${INC}" "${INC_SYS}") |