Commit: 6a696c5bb491367c8bf951d6c57265cf83992aea
Author: Julian Eisel
Date: Wed Nov 23 17:53:39 2016 +0100
Branches: HMD_viewport
https://developer.blender.org/rB6a696c5bb491367c8bf951d6c57265cf83992aea
Fixes for build options
===================================================================
M CMakeLists.txt
M intern/ghost/intern/GHOST_C-api.cpp
M source/blender/editors/space_view3d/space_view3d.c
M source/blender/makesrna/intern/rna_userdef.c
===================================================================
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8c67eb5..2110d25 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -372,7 +372,7 @@ if(WIN32)
endif()
option(WITH_INPUT_NDOF "Enable NDOF input devices (SpaceNavigator and
friends)" ${_init_INPUT_NDOF})
-# IMD - actually not really input, there's also some other stuff for it
+# HMD - actually not really input, there's also some other stuff for it
option(WITH_INPUT_HMD "Enable HMD support in Blender (Head Mounted Displays
for VR support)" ON)
option(WITH_OPENHMD "Enable OpenHMD driver library" ON)
option(WITH_OPENHMD_DYNLOAD "Dynamically load OpenHMD dependencies at runtime"
OFF)
@@ -709,7 +709,7 @@ endif()
if(WITH_INPUT_HMD AND NOT WITH_OPENHMD)
message(WARNING "WITH_INPUT_HMD is enabled, but OpenHMD driver
(WITH_OPENHMD) is disabled. "
- "Only a limited set of HMD features
will be available.")
+ "Only a limited set of HMD features will be available.")
endif()
if(WITH_OPENHMD AND NOT WITH_INPUT_HMD)
diff --git a/intern/ghost/intern/GHOST_C-api.cpp
b/intern/ghost/intern/GHOST_C-api.cpp
index 23a9a64..d44e88c 100644
--- a/intern/ghost/intern/GHOST_C-api.cpp
+++ b/intern/ghost/intern/GHOST_C-api.cpp
@@ -1031,7 +1031,7 @@ float GHOST_HMDgetLensHorizontalSeparation()
GHOST_OpenHMDManager *ohmd = system->getOpenHMDManager();
return ohmd->getLensHorizontalSeparation();
#else
- (void)value;
+ return -1.0f;
#endif
}
diff --git a/source/blender/editors/space_view3d/space_view3d.c
b/source/blender/editors/space_view3d/space_view3d.c
index 72d634d..a0f8244 100644
--- a/source/blender/editors/space_view3d/space_view3d.c
+++ b/source/blender/editors/space_view3d/space_view3d.c
@@ -453,7 +453,7 @@ static void view3d_init(wmWindowManager *wm, ScrArea *sa)
}
}
#else
- UNUSED(wm, sa);
+ UNUSED_VARS(wm, sa);
#endif
}
diff --git a/source/blender/makesrna/intern/rna_userdef.c
b/source/blender/makesrna/intern/rna_userdef.c
index bc703bb..4ad3a56 100644
--- a/source/blender/makesrna/intern/rna_userdef.c
+++ b/source/blender/makesrna/intern/rna_userdef.c
@@ -4072,11 +4072,13 @@ static void rna_def_userdef_system(BlenderRNA *brna)
{0, NULL, 0, NULL, NULL}
};
+#ifdef WITH_INPUT_HMD
static EnumPropertyItem hmd_lensdist_type_items[] = {
{GPU_FX_LENSDIST_NONE, "NONE", 0, "None", "Don't use a lens
distortion/correction shader for the HMD view"},
{GPU_FX_LENSDIST_DK2, "DK2", 0, "DK2", "Use a lens
distortion/correction shader for the DK2"},
{0, NULL, 0, NULL, NULL}
};
+#endif
srna = RNA_def_struct(brna, "UserPreferencesSystem", NULL);
RNA_def_struct_sdna(srna, "UserDef");
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
