summaryrefslogtreecommitdiff
path: root/scene
diff options
context:
space:
mode:
authorMax Hilbrunner <mhilbrunner@users.noreply.github.com>2022-10-19 18:18:36 +0200
committerGitHub <noreply@github.com>2022-10-19 18:18:36 +0200
commit5f7906a289430a9324b0c772b83cc9264fb8ac25 (patch)
treea5bb7e59ba25d244a70a9f7bbbf7be28fb197293 /scene
parent61051a44ccacbe447f14538b5bb4b68a62fc896f (diff)
parent1e7f00949215702e58526bbdfc92e07e0233e08d (diff)
Merge pull request #67527 from BastiaanOlij/fix_tracker_names
Fix two typos in tracker names and a bug in OpenXR haptic feedback
Diffstat (limited to 'scene')
-rw-r--r--scene/3d/xr_nodes.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/scene/3d/xr_nodes.cpp b/scene/3d/xr_nodes.cpp
index fe4ccbc7dc..f5d30c584f 100644
--- a/scene/3d/xr_nodes.cpp
+++ b/scene/3d/xr_nodes.cpp
@@ -363,7 +363,7 @@ void XRNode3D::_unbind_tracker() {
}
void XRNode3D::_changed_tracker(const StringName p_tracker_name, int p_tracker_type) {
- if (p_tracker_name == p_tracker_name) {
+ if (tracker_name == p_tracker_name) {
// just in case unref our current tracker
_unbind_tracker();
@@ -373,7 +373,7 @@ void XRNode3D::_changed_tracker(const StringName p_tracker_name, int p_tracker_t
}
void XRNode3D::_removed_tracker(const StringName p_tracker_name, int p_tracker_type) {
- if (p_tracker_name == p_tracker_name) {
+ if (tracker_name == p_tracker_name) {
// unref our tracker, it's no longer available
_unbind_tracker();
}