Merge branch 'asset-browser-grid-view' into file-browser-grid-view

1 files changed, 8 insertions, 1 deletions

diff --git a/source/blender/windowmanager/xr/intern/wm_xr_action.c b/source/blender/windowmanager/xr/intern/wm_xr_action.c
index 6750e7a7d77..a83415c98af 100644
--- a/source/blender/windowmanager/xr/intern/wm_xr_action.c
+++ b/source/blender/windowmanager/xr/intern/wm_xr_action.c
@@ -391,13 +391,20 @@ void WM_xr_action_binding_destroy(wmXrData *xr,
       xr->runtime->context, action_set_name, 1, &action_name, &profile_path);
 }
 
-bool WM_xr_active_action_set_set(wmXrData *xr, const char *action_set_name)
+bool WM_xr_active_action_set_set(wmXrData *xr, const char *action_set_name, bool delayed)
 {
   wmXrActionSet *action_set = action_set_find(xr, action_set_name);
   if (!action_set) {
     return false;
   }
 
+  if (delayed) {
+    /* Save name to activate action set later, before next actions sync
+     * (see #wm_xr_session_actions_update()). */
+    strcpy(xr->runtime->session_state.active_action_set_next, action_set_name);
+    return true;
+  }
+
   {
     /* Clear any active modal/haptic actions. */
     wmXrActionSet *active_action_set = xr->runtime->session_state.active_action_set;