[Bf-blender-cvs] [03151595012] vr_scene_inspection: Minor cleanup: Use r_ prefix for return arguments
Julian Eisel
noreply at git.blender.org
Tue Mar 10 01:41:13 CET 2020
Commit: 03151595012c8386b43be37373087fb47306f71a
Author: Julian Eisel
Date: Sun Feb 16 16:21:38 2020 +0100
Branches: vr_scene_inspection
https://developer.blender.org/rB03151595012c8386b43be37373087fb47306f71a
Minor cleanup: Use r_ prefix for return arguments
===================================================================
M source/blender/windowmanager/WM_api.h
M source/blender/windowmanager/intern/wm_xr.c
===================================================================
diff --git a/source/blender/windowmanager/WM_api.h b/source/blender/windowmanager/WM_api.h
index 10bc505fbc1..b9ee08be35e 100644
--- a/source/blender/windowmanager/WM_api.h
+++ b/source/blender/windowmanager/WM_api.h
@@ -874,8 +874,8 @@ void WM_generic_user_data_free(struct wmGenericUserData *user_data);
#ifdef WITH_XR_OPENXR
/* wm_xr.c */
bool WM_xr_session_is_running(const wmXrData *xr);
-void WM_xr_session_state_viewer_location_get(const wmXrData *xr, float location[3]);
-void WM_xr_session_state_viewer_rotation_get(const wmXrData *xr, float rotation[4]);
+void WM_xr_session_state_viewer_location_get(const wmXrData *xr, float r_location[3]);
+void WM_xr_session_state_viewer_rotation_get(const wmXrData *xr, float r_rotation[4]);
void WM_xr_session_state_viewer_matrix_info_get(const wmXrData *xr,
float r_viewmat[4][4],
float *r_focal_len);
diff --git a/source/blender/windowmanager/intern/wm_xr.c b/source/blender/windowmanager/intern/wm_xr.c
index bdb53d01fad..19e992fb3c1 100644
--- a/source/blender/windowmanager/intern/wm_xr.c
+++ b/source/blender/windowmanager/intern/wm_xr.c
@@ -301,22 +301,22 @@ static void wm_xr_runtime_session_state_info_update(bXrRuntimeSessionState *stat
state->last_known.is_initialized = true;
}
-void WM_xr_session_state_viewer_location_get(const wmXrData *xr, float location[3])
+void WM_xr_session_state_viewer_location_get(const wmXrData *xr, float r_location[3])
{
if (!WM_xr_session_is_running(xr) || !xr->session_state->last_known.is_initialized) {
return;
}
- copy_v3_v3(location, xr->session_state->last_known.viewer_pose.position);
+ copy_v3_v3(r_location, xr->session_state->last_known.viewer_pose.position);
}
-void WM_xr_session_state_viewer_rotation_get(const wmXrData *xr, float rotation[4])
+void WM_xr_session_state_viewer_rotation_get(const wmXrData *xr, float r_rotation[4])
{
if (!WM_xr_session_is_running(xr) || !xr->session_state->last_known.is_initialized) {
return;
}
- copy_v4_v4(rotation, xr->session_state->last_known.viewer_pose.orientation_quat);
+ copy_v4_v4(r_rotation, xr->session_state->last_known.viewer_pose.orientation_quat);
}
void WM_xr_session_state_viewer_matrix_info_get(const wmXrData *xr,
More information about the Bf-blender-cvs
mailing list