Commit: 6907aa26c645ef75d0dea09e9d548fc36a5d9f07
Author: Julian Eisel
Date: Sun Mar 5 22:32:46 2017 +0100
Branches: HMD_viewport
https://developer.blender.org/rB6907aa26c645ef75d0dea09e9d548fc36a5d9f07
Disable OpenHMD dummy device for release builds
Also fixing warning.
===================================================================
M source/blender/windowmanager/intern/wm_device.c
M source/blender/windowmanager/intern/wm_window.c
===================================================================
diff --git a/source/blender/windowmanager/intern/wm_device.c
b/source/blender/windowmanager/intern/wm_device.c
index 0c16fba33d..d4b99d9a22 100644
--- a/source/blender/windowmanager/intern/wm_device.c
+++ b/source/blender/windowmanager/intern/wm_device.c
@@ -51,7 +51,14 @@
int WM_device_HMD_num_devices_get(void)
{
- return GHOST_HMDgetNumDevices();
+ const int tot_devices = GHOST_HMDgetNumDevices();
+
+#ifdef NDEBUG
+ /* OpenHMD always places the dummy device last, we don't want to
display it in non-debug builds. */
+ return tot_devices - 1;
+#else
+ return tot_devices;
+#endif
}
/**
diff --git a/source/blender/windowmanager/intern/wm_window.c
b/source/blender/windowmanager/intern/wm_window.c
index ca012d8847..36f36e0022 100644
--- a/source/blender/windowmanager/intern/wm_window.c
+++ b/source/blender/windowmanager/intern/wm_window.c
@@ -674,7 +674,7 @@ static bool wm_window_setup_type(bContext *C, Scene *scene,
wmWindow *win, rcti
sa = win->screen->areabase.first;
CTX_wm_area_set(C, sa);
- int spacetype;
+ int spacetype = SPACE_EMPTY;
switch (type) {
case WM_WINDOW_RENDER:
spacetype = SPACE_IMAGE;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
