Merge pull request #68321 from BastiaanOlij/xrorigin_start_pos

Update XRServer with starting position of (new) current XROrigin3D

1 files changed, 6 insertions, 0 deletions

diff --git a/scene/3d/xr_nodes.cpp b/scene/3d/xr_nodes.cpp
index f5d30c584f..ca7d1dfc1d 100644
--- a/scene/3d/xr_nodes.cpp
+++ b/scene/3d/xr_nodes.cpp
@@ -644,6 +644,12 @@ void XROrigin3D::set_current(bool p_enabled) {
 				origin_nodes[i]->set_current(false);
 			}
 		}
+
+		// update XRServer with our current position
+		XRServer *xr_server = XRServer::get_singleton();
+		ERR_FAIL_NULL(xr_server);
+
+		xr_server->set_world_origin(get_global_transform());
 	} else {
 		bool found = false;
 		// We no longer have a current origin so find the first one we can make current