summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLightning_A <aaronjrecord@gmail.com>2021-08-09 09:03:45 -0600
committerLightning_A <aaronjrecord@gmail.com>2021-09-30 15:07:30 -0600
commite4dfa69bcf58e4d50acdde32c590364e43fce3ab (patch)
treef2e67fe35bacb7ef3171c80b5acb54a6dfd55d89
parent3e1b6304613855cad56938e8a58848f09363a298 (diff)
Fix non-const iterators in const methods
-rw-r--r--editor/animation_track_editor.cpp11
-rw-r--r--scene/animation/animation_blend_tree.cpp4
2 files changed, 6 insertions, 9 deletions
diff --git a/editor/animation_track_editor.cpp b/editor/animation_track_editor.cpp
index 324237ff82..76e71a1030 100644
--- a/editor/animation_track_editor.cpp
+++ b/editor/animation_track_editor.cpp
@@ -702,8 +702,7 @@ public:
for (Map<int, List<float>>::Element *E = key_ofs_map.front(); E; E = E->next()) {
int key = 0;
- for (float &F : E->value()) {
- float key_ofs = F;
+ for (const float &key_ofs : E->value()) {
if (from != key_ofs) {
key++;
continue;
@@ -728,8 +727,7 @@ public:
bool change_notify_deserved = false;
for (Map<int, List<float>>::Element *E = key_ofs_map.front(); E; E = E->next()) {
int track = E->key();
- for (float &F : E->value()) {
- float key_ofs = F;
+ for (const float &key_ofs : E->value()) {
int key = animation->track_find_key(track, key_ofs, true);
ERR_FAIL_COND_V(key == -1, false);
@@ -986,8 +984,7 @@ public:
bool _get(const StringName &p_name, Variant &r_ret) const {
for (Map<int, List<float>>::Element *E = key_ofs_map.front(); E; E = E->next()) {
int track = E->key();
- for (float &F : E->value()) {
- float key_ofs = F;
+ for (const float &key_ofs : E->value()) {
int key = animation->track_find_key(track, key_ofs, true);
ERR_CONTINUE(key == -1);
@@ -1137,7 +1134,7 @@ public:
same_key_type = false;
}
- for (float &F : E->value()) {
+ for (const float &F : E->value()) {
int key = animation->track_find_key(track, F, true);
ERR_FAIL_COND(key == -1);
if (first_key < 0) {
diff --git a/scene/animation/animation_blend_tree.cpp b/scene/animation/animation_blend_tree.cpp
index af186072ac..c5f36bb98d 100644
--- a/scene/animation/animation_blend_tree.cpp
+++ b/scene/animation/animation_blend_tree.cpp
@@ -978,7 +978,7 @@ AnimationNodeBlendTree::ConnectionError AnimationNodeBlendTree::can_connect_node
for (Map<StringName, Node>::Element *E = nodes.front(); E; E = E->next()) {
for (int i = 0; i < E->get().connections.size(); i++) {
- StringName output = E->get().connections[i];
+ const StringName output = E->get().connections[i];
if (output == p_output_node) {
return CONNECTION_ERROR_CONNECTION_EXISTS;
}
@@ -990,7 +990,7 @@ AnimationNodeBlendTree::ConnectionError AnimationNodeBlendTree::can_connect_node
void AnimationNodeBlendTree::get_node_connections(List<NodeConnection> *r_connections) const {
for (Map<StringName, Node>::Element *E = nodes.front(); E; E = E->next()) {
for (int i = 0; i < E->get().connections.size(); i++) {
- StringName output = E->get().connections[i];
+ const StringName output = E->get().connections[i];
if (output != StringName()) {
NodeConnection nc;
nc.input_node = E->key();