[Bf-blender-cvs] [f4b6ce38a48] vr_scene_inspection: Fix XR toggle possibly starting already started session

Julian Eisel noreply at git.blender.org
Thu Mar 12 13:13:37 CET 2020


Commit: f4b6ce38a48a237cc6e43dcf449d9f5ecfba235c
Author: Julian Eisel
Date:   Thu Mar 12 13:09:53 2020 +0100
Branches: vr_scene_inspection
https://developer.blender.org/rBf4b6ce38a48a237cc6e43dcf449d9f5ecfba235c

Fix XR toggle possibly starting already started session

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

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

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

diff --git a/source/blender/windowmanager/intern/wm_xr.c b/source/blender/windowmanager/intern/wm_xr.c
index 0eb72e1b8e2..1500f16879d 100644
--- a/source/blender/windowmanager/intern/wm_xr.c
+++ b/source/blender/windowmanager/intern/wm_xr.c
@@ -388,13 +388,14 @@ static void wm_xr_session_begin_info_create(const XrRuntimeSessionState *UNUSED(
 
 void wm_xr_session_toggle(wmXrData *xr_data)
 {
-  if (WM_xr_session_is_running(xr_data)) {
+  if (WM_xr_session_was_started(xr_data)) {
     GHOST_XrSessionEnd(xr_data->context);
     wm_xr_runtime_session_state_free(&xr_data->session_state);
   }
   else {
     GHOST_XrSessionBeginInfo begin_info;
 
+    BLI_assert(xr_data->session_state == NULL);
     xr_data->session_state = wm_xr_runtime_session_state_create();
     wm_xr_session_begin_info_create(xr_data->session_state, &begin_info);



More information about the Bf-blender-cvs mailing list