[Bf-blender-cvs] [1b81d776d7a] HMD_viewport: Correct last commit, also quiet warnings
Campbell Barton
noreply at git.blender.org
Sun Apr 2 18:06:11 CEST 2017
Commit: 1b81d776d7a8c7dd05a92891627004d4d8649037
Author: Campbell Barton
Date: Mon Apr 3 02:05:44 2017 +1000
Branches: HMD_viewport
https://developer.blender.org/rB1b81d776d7a8c7dd05a92891627004d4d8649037
Correct last commit, also quiet warnings
===================================================================
M extern/openhmd/src/drv_psvr/psvr.c
M source/blender/editors/space_view3d/view3d_draw.c
===================================================================
diff --git a/extern/openhmd/src/drv_psvr/psvr.c b/extern/openhmd/src/drv_psvr/psvr.c
index 0203d130208..2985ed11818 100644
--- a/extern/openhmd/src/drv_psvr/psvr.c
+++ b/extern/openhmd/src/drv_psvr/psvr.c
@@ -156,7 +156,7 @@ static hid_device* open_device_idx(int manufacturer, int product, int iface, int
hid_device* ret = NULL;
while (cur_dev) {
- printf("%04x:%04x %s\n", manufacturer, product, cur_dev->path);
+ printf("%04x:%04x %s\n", (unsigned int)manufacturer, (unsigned int)product, cur_dev->path);
if(idx == device_index && iface == iface_cur){
ret = hid_open_path(cur_dev->path);
diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c
index 53e7ecb1a5e..1c5890388e5 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -3231,7 +3231,7 @@ void ED_view3d_draw_offscreen(
}
const bool is_left = v3d->multiview_eye == STEREO_LEFT_ID;
#ifdef WITH_INPUT_HMD
- void *hmd_distortion_params = WM_device_HMD_distortion_parameters_get()
+ void *hmd_distortion_params = WM_device_HMD_distortion_parameters_get();
#else
void *hmd_distortion_params = NULL;
#endif
More information about the Bf-blender-cvs
mailing list