summaryrefslogtreecommitdiffstats
path: root/modules/openxr/openxr_interface.cpp
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2023-08-18 09:30:52 +0200
committerRémi Verschelde <rverschelde@gmail.com>2023-08-18 09:30:52 +0200
commit8a02cd088320cb428c5ea157a26ce739aab8f0cd (patch)
treee9d6e406fe12095f97acf1073543c41b6c3c312a /modules/openxr/openxr_interface.cpp
parenta017e9c69877be77744dfb2bff0bbc2a811427cf (diff)
parenta60cf6ed6c842539895ac5a92151354dea40692f (diff)
downloadredot-engine-8a02cd088320cb428c5ea157a26ce739aab8f0cd.tar.gz
Merge pull request #80419 from Faolan-Rad/fix-multi_actionsets
Properly load multiple action sets in XR
Diffstat (limited to 'modules/openxr/openxr_interface.cpp')
-rw-r--r--modules/openxr/openxr_interface.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/modules/openxr/openxr_interface.cpp b/modules/openxr/openxr_interface.cpp
index 933148da87..cc2b4fa11b 100644
--- a/modules/openxr/openxr_interface.cpp
+++ b/modules/openxr/openxr_interface.cpp
@@ -555,9 +555,11 @@ bool OpenXRInterface::initialize() {
xr_server->add_tracker(head);
// attach action sets
+ Vector<RID> loaded_action_sets;
for (int i = 0; i < action_sets.size(); i++) {
- openxr_api->action_set_attach(action_sets[i]->action_set_rid);
+ loaded_action_sets.append(action_sets[i]->action_set_rid);
}
+ openxr_api->attach_action_sets(loaded_action_sets);
// make this our primary interface
xr_server->set_primary_interface(this);