noahbackus/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Merge pull request #120300 from m4gr3d/fix_spatial_marker_tracking_crash

Browse Source 
[XR] Fix a crash when spatial entity marker trackers are detected
This commit is contained in:
Thaddeus Crews
2026-06-15 08:52:36 -05:00
parent df6235838b f30ffa8b44
commit 1f92b45db3
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/openxr/extensions/spatial_entities/openxr_spatial_marker_tracking.cpp
+1 -1
View File
@@ -607,7 +607,7 @@ void OpenXRSpatialMarkerTrackingCapability::do_entity_update(RID p_spatial_conte
// And we get our update snapshot, this is NOT async!
RID snapshot = se_extension->update_spatial_entities(p_spatial_context, entities, component_types, p_next_snapshot_create);
if (snapshot.is_valid()) {
_process_snapshot(snapshot, p_spatial_context, false, p_component_data, p_next_snapshot_query, nullptr);
_process_snapshot(snapshot, p_spatial_context, false, p_component_data, p_next_snapshot_query);
}
}
modules/openxr/extensions/spatial_entities/openxr_spatial_marker_tracking.h
+1 -1
View File
@@ -273,7 +273,7 @@ private:
void _on_spatial_discovery_recommended(RID p_spatial_context);
void _process_snapshot(RID p_snapshot, RID p_spatial_context, bool p_is_discovery, TypedArray<OpenXRSpatialComponentData> p_component_data, Ref<OpenXRStructureBase> p_next_snapshot_query, const Callable &p_user_callback);
void _process_snapshot(RID p_snapshot, RID p_spatial_context, bool p_is_discovery, TypedArray<OpenXRSpatialComponentData> p_component_data, Ref<OpenXRStructureBase> p_next_snapshot_query, const Callable &p_user_callback = Callable());
// Trackers; maps each Spatial Context RID to their marker entities and trackers
HashMap<RID, HashMap<XrSpatialEntityIdEXT, Ref<OpenXRMarkerTracker>>> marker_trackers;