godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #95959 from dsnopek/openxr-api-hand-tracker-crash 

Fix crash when calling `OpenXRAPI::get_hand_tracker()` and hand-tracking is disabled
This commit is contained in:
Rémi Verschelde 2024-08-25 20:18:28 +02:00
parent 844ac90bad 11dd1f52ae
commit 887d56721d
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/openxr/openxr_api.cpp
View File

@ -1737,8 +1737,12 @@ void OpenXRAPI::cleanup_extension_wrappers() {
XrHandTrackerEXT OpenXRAPI::get_hand_tracker(int p_hand_index) { XrHandTrackerEXT OpenXRAPI::get_hand_tracker(int p_hand_index) {
ERR_FAIL_INDEX_V(p_hand_index, OpenXRHandTrackingExtension::HandTrackedHands::OPENXR_MAX_TRACKED_HANDS, XR_NULL_HANDLE); ERR_FAIL_INDEX_V(p_hand_index, OpenXRHandTrackingExtension::HandTrackedHands::OPENXR_MAX_TRACKED_HANDS, XR_NULL_HANDLE);
OpenXRHandTrackingExtension *hand_tracking = OpenXRHandTrackingExtension::get_singleton();
ERR_FAIL_NULL_V(hand_tracking, XR_NULL_HANDLE);
OpenXRHandTrackingExtension::HandTrackedHands hand = static_cast<OpenXRHandTrackingExtension::HandTrackedHands>(p_hand_index); OpenXRHandTrackingExtension::HandTrackedHands hand = static_cast<OpenXRHandTrackingExtension::HandTrackedHands>(p_hand_index);
return OpenXRHandTrackingExtension::get_singleton()->get_hand_tracker(hand)->hand_tracker; return hand_tracking->get_hand_tracker(hand)->hand_tracker;
} }
Size2 OpenXRAPI::get_recommended_target_size() { Size2 OpenXRAPI::get_recommended_target_size() {