[Bf-blender-cvs] [b4d36c7] master: Two fixes for optional ndof & fix bplayer for that...

[Bastien Montagne]

Commit: b4d36c77da7e0e545b61d96d49b8122b2f00003a
Author: Bastien Montagne
Date:   Thu Aug 18 15:13:58 2016 +0200
Branches: master
https://developer.blender.org/rBb4d36c77da7e0e545b61d96d49b8122b2f00003a

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.

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

M	source/blender/makesrna/intern/rna_wm.c
M	source/blenderplayer/bad_level_call_stubs/CMakeLists.txt

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

diff --git a/source/blender/makesrna/intern/rna_wm.c b/source/blender/makesrna/intern/rna_wm.c
index ba77e2a..1f991b2 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 1d681d2..0e570e1 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}")