[Bf-blender-cvs] [e2bf7b15649] vr_scene_inspection: Don't return uninitialized values when early-exiting

[Julian Eisel]

Commit: e2bf7b1564982ea30e9a880c45038f25bf3f3460
Author: Julian Eisel
Date:   Wed Mar 11 20:54:16 2020 +0100
Branches: vr_scene_inspection
https://developer.blender.org/rBe2bf7b1564982ea30e9a880c45038f25bf3f3460

Don't return uninitialized values when early-exiting

===================================================================

M	source/blender/makesrna/intern/rna_xr.c
M	source/blender/windowmanager/intern/wm_xr.c

===================================================================

diff --git a/source/blender/makesrna/intern/rna_xr.c b/source/blender/makesrna/intern/rna_xr.c
index f774866d519..27ef32524c6 100644
--- a/source/blender/makesrna/intern/rna_xr.c
+++ b/source/blender/makesrna/intern/rna_xr.c
@@ -67,7 +67,7 @@ static void rna_XrRuntimeSessionState_viewer_location_get(PointerRNA *ptr, float
   WM_xr_session_state_viewer_location_get(xr, r_values);
 #  else
   UNUSED_VARS(ptr);
-  copy_v3_fl(r_values, 0.0f);
+  zero_v3(r_values);
 #  endif
 }
 
diff --git a/source/blender/windowmanager/intern/wm_xr.c b/source/blender/windowmanager/intern/wm_xr.c
index 90759cc5c30..b1d542f2a6b 100644
--- a/source/blender/windowmanager/intern/wm_xr.c
+++ b/source/blender/windowmanager/intern/wm_xr.c
@@ -315,6 +315,7 @@ static void wm_xr_runtime_session_state_update(XrRuntimeSessionState *state,
 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->is_initialized) {
+    zero_v3(r_location);
     return;
   }
 
@@ -324,6 +325,7 @@ void WM_xr_session_state_viewer_location_get(const wmXrData *xr, float r_locatio
 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->is_initialized) {
+    unit_qt(r_rotation);
     return;
   }
 
@@ -335,6 +337,8 @@ void WM_xr_session_state_viewer_matrix_info_get(const wmXrData *xr,
                                                 float *r_focal_len)
 {
   if (!WM_xr_session_is_running(xr) || !xr->session_state->is_initialized) {
+    unit_m4(r_viewmat);
+    *r_focal_len = 0.0f;
     return;
   }