Merge branch 'blender-v2.90-release'

2020-07-23 18:10:28 +02:00 · 2020-07-23 18:10:28 +02:00 · 5ccb0f46dd
parent 149bb0c26d 954aa441bf
commit 5ccb0f46dd
1 changed files with 2 additions and 0 deletions
--- a/source/blender/windowmanager/xr/intern/wm_xr_session.c
+++ b/source/blender/windowmanager/xr/intern/wm_xr_session.c
@ -278,6 +278,8 @@ void wm_xr_session_state_update(const XrSessionSettings *settings,
  state->prev_base_pose_type = settings->base_pose_type;
  state->prev_base_pose_object = settings->base_pose_object;
  state->is_view_data_set = true;
+  /* Assume this was already done through wm_xr_session_draw_data_update(). */
+  state->force_reset_to_base_pose = false;
 }

 wmXrSessionState *WM_xr_session_state_handle_get(const wmXrData *xr)