3 files changed, 15 insertions, 16 deletions

diff --git a/scene/3d/skeleton_3d.cpp b/scene/3d/skeleton_3d.cpp
index fbc3767151..e3744ad5e9 100644
--- a/scene/3d/skeleton_3d.cpp
+++ b/scene/3d/skeleton_3d.cpp
@@ -178,32 +178,32 @@ void Skeleton3D::_get_property_list(List<PropertyInfo> *p_list) const {
 }
 
 void Skeleton3D::_validate_property(PropertyInfo &property) const {
-	PackedStringArray spr = property.name.split("/");
-	if (spr.size() == 3 && spr[0] == "bones") {
-		if (spr[2] == "rest") {
+	PackedStringArray split = property.name.split("/");
+	if (split.size() == 3 && split[0] == "bones") {
+		if (split[2] == "rest") {
 			property.usage |= PROPERTY_USAGE_READ_ONLY;
 		}
 		if (is_show_rest_only()) {
-			if (spr[2] == "enabled") {
+			if (split[2] == "enabled") {
 				property.usage |= PROPERTY_USAGE_READ_ONLY;
 			}
-			if (spr[2] == "position") {
+			if (split[2] == "position") {
 				property.usage |= PROPERTY_USAGE_READ_ONLY;
 			}
-			if (spr[2] == "rotation") {
+			if (split[2] == "rotation") {
 				property.usage |= PROPERTY_USAGE_READ_ONLY;
 			}
-			if (spr[2] == "scale") {
+			if (split[2] == "scale") {
 				property.usage |= PROPERTY_USAGE_READ_ONLY;
 			}
-		} else if (!is_bone_enabled(spr[1].to_int())) {
-			if (spr[2] == "position") {
+		} else if (!is_bone_enabled(split[1].to_int())) {
+			if (split[2] == "position") {
 				property.usage |= PROPERTY_USAGE_READ_ONLY;
 			}
-			if (spr[2] == "rotation") {
+			if (split[2] == "rotation") {
 				property.usage |= PROPERTY_USAGE_READ_ONLY;
 			}
-			if (spr[2] == "scale") {
+			if (split[2] == "scale") {
 				property.usage |= PROPERTY_USAGE_READ_ONLY;
 			}
 		}
diff --git a/scene/resources/animation.cpp b/scene/resources/animation.cpp
index 08b78a39b1..55d58bf156 100644
--- a/scene/resources/animation.cpp
+++ b/scene/resources/animation.cpp
@@ -837,9 +837,9 @@ NodePath Animation::track_get_path(int p_track) const {
 	return tracks[p_track]->path;
 }
 
-int Animation::find_track(const NodePath &p_path) const {
+int Animation::find_track(const NodePath &p_path, const TrackType p_type) const {
 	for (int i = 0; i < tracks.size(); i++) {
-		if (tracks[i]->path == p_path) {
+		if (tracks[i]->path == p_path && tracks[i]->type == p_type) {
 			return i;
 		}
 	};
@@ -3027,7 +3027,7 @@ void Animation::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("track_get_type", "track_idx"), &Animation::track_get_type);
 	ClassDB::bind_method(D_METHOD("track_get_path", "track_idx"), &Animation::track_get_path);
 	ClassDB::bind_method(D_METHOD("track_set_path", "track_idx", "path"), &Animation::track_set_path);
-	ClassDB::bind_method(D_METHOD("find_track", "path"), &Animation::find_track);
+	ClassDB::bind_method(D_METHOD("find_track", "path", "type"), &Animation::find_track);
 
 	ClassDB::bind_method(D_METHOD("track_move_up", "track_idx"), &Animation::track_move_up);
 	ClassDB::bind_method(D_METHOD("track_move_down", "track_idx"), &Animation::track_move_down);
diff --git a/scene/resources/animation.h b/scene/resources/animation.h
index 4ee0741d87..6de739f737 100644
--- a/scene/resources/animation.h
+++ b/scene/resources/animation.h
@@ -281,8 +281,7 @@ public:
 
 	void track_set_path(int p_track, const NodePath &p_path);
 	NodePath track_get_path(int p_track) const;
-	int find_track(const NodePath &p_path) const;
-	// transform
+	int find_track(const NodePath &p_path, const TrackType p_type) const;
 
 	void track_move_up(int p_track);
 	void track_move_down(int p_track);