[Bf-blender-cvs] [4c4333e] HMD_viewport: Add asserts for total device number
Julian Eisel
noreply at git.blender.org
Fri May 20 23:17:07 CEST 2016
Commit: 4c4333e06c8a0f198202bd94e4aecd31067f5aba
Author: Julian Eisel
Date: Fri May 20 23:13:35 2016 +0200
Branches: HMD_viewport
https://developer.blender.org/rB4c4333e06c8a0f198202bd94e4aecd31067f5aba
Add asserts for total device number
===================================================================
M source/blender/windowmanager/WM_api.h
M source/blender/windowmanager/intern/wm_device.c
===================================================================
diff --git a/source/blender/windowmanager/WM_api.h b/source/blender/windowmanager/WM_api.h
index ba55e32..8ccdb19 100644
--- a/source/blender/windowmanager/WM_api.h
+++ b/source/blender/windowmanager/WM_api.h
@@ -530,7 +530,8 @@ int WM_device_HMD_current_get(void);
const char *WM_device_HMD_name_get(int index);
const char *WM_device_HMD_vendor_get(int index);
float WM_device_HMD_IPD_get(void);
-#endif
+
+#endif /* WITH_INPUT_HMD */
#ifdef __cplusplus
}
diff --git a/source/blender/windowmanager/intern/wm_device.c b/source/blender/windowmanager/intern/wm_device.c
index 1168a89..2055f2c 100644
--- a/source/blender/windowmanager/intern/wm_device.c
+++ b/source/blender/windowmanager/intern/wm_device.c
@@ -55,6 +55,7 @@ int WM_device_HMD_num_devices_get(void)
*/
void WM_device_HMD_state_set(const int device, const bool enable)
{
+ BLI_assert(device < MAX_HMD_DEVICES);
if (enable && (device >= 0)) {
/* GHOST closes previously opened device if needed */
GHOST_HMDopenDevice(device);
@@ -74,11 +75,13 @@ int WM_device_HMD_current_get(void)
const char *WM_device_HMD_name_get(int index)
{
+ BLI_assert(index < MAX_HMD_DEVICES);
return GHOST_HMDgetDeviceName(index);
}
const char *WM_device_HMD_vendor_get(int index)
{
+ BLI_assert(index < MAX_HMD_DEVICES);
return GHOST_HMDgetVendorName(index);
}
More information about the Bf-blender-cvs
mailing list