Merge pull request #25853 from marxin/fix-25316-wshadow-local

Add -Wshadow=local to warnings and fix reported issues (#25316).

1 files changed, 15 insertions, 15 deletions

diff --git a/scene/animation/animation_tree_player.cpp b/scene/animation/animation_tree_player.cpp
index e3a21d8b46..3420b48ae3 100644
--- a/scene/animation/animation_tree_player.cpp
+++ b/scene/animation/animation_tree_player.cpp
@@ -136,9 +136,9 @@ bool AnimationTreePlayer::_set(const StringName &p_name, const Variant &p_value)
 				else
 					animation_node_set_animation(id, node.get_valid("animation"));
 				Array filters = node.get_valid("filter");
-				for (int i = 0; i < filters.size(); i++) {
+				for (int j = 0; j < filters.size(); j++) {
 
-					animation_node_set_filter_path(id, filters[i], true);
+					animation_node_set_filter_path(id, filters[j], true);
 				}
 			} break;
 			case NODE_ONESHOT: {
@@ -150,9 +150,9 @@ bool AnimationTreePlayer::_set(const StringName &p_name, const Variant &p_value)
 				oneshot_node_set_autorestart_delay(id, node.get_valid("autorestart_delay"));
 				oneshot_node_set_autorestart_random_delay(id, node.get_valid("autorestart_random_delay"));
 				Array filters = node.get_valid("filter");
-				for (int i = 0; i < filters.size(); i++) {
+				for (int j = 0; j < filters.size(); j++) {
 
-					oneshot_node_set_filter_path(id, filters[i], true);
+					oneshot_node_set_filter_path(id, filters[j], true);
 				}
 
 			} break;
@@ -162,9 +162,9 @@ bool AnimationTreePlayer::_set(const StringName &p_name, const Variant &p_value)
 			case NODE_BLEND2: {
 				blend2_node_set_amount(id, node.get_valid("blend"));
 				Array filters = node.get_valid("filter");
-				for (int i = 0; i < filters.size(); i++) {
+				for (int j = 0; j < filters.size(); j++) {
 
-					blend2_node_set_filter_path(id, filters[i], true);
+					blend2_node_set_filter_path(id, filters[j], true);
 				}
 			} break;
 			case NODE_BLEND3: {
@@ -278,8 +278,8 @@ bool AnimationTreePlayer::_get(const StringName &p_name, Variant &r_ret) const {
 				an->filter.get_key_list(&keys);
 				k.resize(keys.size());
 				int i = 0;
-				for (List<NodePath>::Element *E = keys.front(); E; E = E->next()) {
-					k[i++] = E->get();
+				for (List<NodePath>::Element *F = keys.front(); F; F = F->next()) {
+					k[i++] = F->get();
 				}
 				node["filter"] = k;
 			} break;
@@ -297,8 +297,8 @@ bool AnimationTreePlayer::_get(const StringName &p_name, Variant &r_ret) const {
 				osn->filter.get_key_list(&keys);
 				k.resize(keys.size());
 				int i = 0;
-				for (List<NodePath>::Element *E = keys.front(); E; E = E->next()) {
-					k[i++] = E->get();
+				for (List<NodePath>::Element *F = keys.front(); F; F = F->next()) {
+					k[i++] = F->get();
 				}
 				node["filter"] = k;
 
@@ -315,8 +315,8 @@ bool AnimationTreePlayer::_get(const StringName &p_name, Variant &r_ret) const {
 				bn->filter.get_key_list(&keys);
 				k.resize(keys.size());
 				int i = 0;
-				for (List<NodePath>::Element *E = keys.front(); E; E = E->next()) {
-					k[i++] = E->get();
+				for (List<NodePath>::Element *F = keys.front(); F; F = F->next()) {
+					k[i++] = F->get();
 				}
 				node["filter"] = k;
 
@@ -874,10 +874,10 @@ void AnimationTreePlayer::_process_animation(float p_delta) {
 
 						List<int> indices;
 						a->method_track_get_key_indices(tr.local_track, anim_list->time, anim_list->step, &indices);
-						for (List<int>::Element *E = indices.front(); E; E = E->next()) {
+						for (List<int>::Element *F = indices.front(); F; F = F->next()) {
 
-							StringName method = a->method_track_get_name(tr.local_track, E->get());
-							Vector<Variant> args = a->method_track_get_params(tr.local_track, E->get());
+							StringName method = a->method_track_get_name(tr.local_track, F->get());
+							Vector<Variant> args = a->method_track_get_params(tr.local_track, F->get());
 							args.resize(VARIANT_ARG_MAX);
 							tr.track->object->call(method, args[0], args[1], args[2], args[3], args[4]);
 						}