[Bf-blender-cvs] [61a5fcc83a2] vr_scene_inspection: Fix uninitialized variables when WITH_XR_OPENXR is disabled
Julian Eisel
noreply at git.blender.org
Wed Mar 11 22:18:41 CET 2020
Commit: 61a5fcc83a2c4b8c5099317bf26e72e8ba2c8a4d
Author: Julian Eisel
Date: Wed Mar 11 20:40:42 2020 +0100
Branches: vr_scene_inspection
https://developer.blender.org/rB61a5fcc83a2c4b8c5099317bf26e72e8ba2c8a4d
Fix uninitialized variables when WITH_XR_OPENXR is disabled
===================================================================
M source/blender/makesrna/intern/rna_xr.c
===================================================================
diff --git a/source/blender/makesrna/intern/rna_xr.c b/source/blender/makesrna/intern/rna_xr.c
index 04340b7a916..f774866d519 100644
--- a/source/blender/makesrna/intern/rna_xr.c
+++ b/source/blender/makesrna/intern/rna_xr.c
@@ -30,6 +30,8 @@
#ifdef RNA_RUNTIME
+# include "BLI_math.h"
+
# include "WM_api.h"
static bool rna_XrRuntimeSessionState_is_running(bContext *C)
@@ -58,23 +60,25 @@ static wmXrData *rna_XrRuntimeSessionState_wm_xr_data_get(PointerRNA *ptr)
}
# endif
-static void rna_XrRuntimeSessionState_viewer_location_get(PointerRNA *ptr, float *values)
+static void rna_XrRuntimeSessionState_viewer_location_get(PointerRNA *ptr, float *r_values)
{
# ifdef WITH_XR_OPENXR
const wmXrData *xr = rna_XrRuntimeSessionState_wm_xr_data_get(ptr);
- WM_xr_session_state_viewer_location_get(xr, values);
+ WM_xr_session_state_viewer_location_get(xr, r_values);
# else
- UNUSED_VARS(ptr, values);
+ UNUSED_VARS(ptr);
+ copy_v3_fl(r_values, 0.0f);
# endif
}
-static void rna_XrRuntimeSessionState_viewer_rotation_get(PointerRNA *ptr, float *values)
+static void rna_XrRuntimeSessionState_viewer_rotation_get(PointerRNA *ptr, float *r_values)
{
# ifdef WITH_XR_OPENXR
const wmXrData *xr = rna_XrRuntimeSessionState_wm_xr_data_get(ptr);
- WM_xr_session_state_viewer_rotation_get(xr, values);
+ WM_xr_session_state_viewer_rotation_get(xr, r_values);
# else
- UNUSED_VARS(ptr, values);
+ UNUSED_VARS(ptr);
+ unit_qt(r_values);
# endif
}
More information about the Bf-blender-cvs
mailing list