1 files changed, 129 insertions, 198 deletions

diff --git a/scene/animation/animation_player.cpp b/scene/animation/animation_player.cpp
index b657833a3b..4e56f1acf0 100644
--- a/scene/animation/animation_player.cpp
+++ b/scene/animation/animation_player.cpp
@@ -40,7 +40,6 @@
 #include "scene/2d/skeleton_2d.h"
 
 void AnimatedValuesBackup::update_skeletons() {
-
 	for (int i = 0; i < entries.size(); i++) {
 		if (entries[i].bone_idx != -1) {
 			// 3D bone
@@ -57,7 +56,6 @@ void AnimatedValuesBackup::update_skeletons() {
 #endif
 
 bool AnimationPlayer::_set(const StringName &p_name, const Variant &p_value) {
-
 	String name = p_name;
 
 	if (name.begins_with("playback/play")) { // bw compatibility
@@ -65,23 +63,19 @@ bool AnimationPlayer::_set(const StringName &p_name, const Variant &p_value) {
 		set_current_animation(p_value);
 
 	} else if (name.begins_with("anims/")) {
-
 		String which = name.get_slicec('/', 1);
 		add_animation(which, p_value);
 
 	} else if (name.begins_with("next/")) {
-
 		String which = name.get_slicec('/', 1);
 		animation_set_next(which, p_value);
 
 	} else if (p_name == SceneStringNames::get_singleton()->blend_times) {
-
 		Array array = p_value;
 		int len = array.size();
 		ERR_FAIL_COND_V(len % 3, false);
 
 		for (int i = 0; i < len / 3; i++) {
-
 			StringName from = array[i * 3 + 0];
 			StringName to = array[i * 3 + 1];
 			float time = array[i * 3 + 2];
@@ -89,14 +83,14 @@ bool AnimationPlayer::_set(const StringName &p_name, const Variant &p_value) {
 			set_blend_time(from, to, time);
 		}
 
-	} else
+	} else {
 		return false;
+	}
 
 	return true;
 }
 
 bool AnimationPlayer::_get(const StringName &p_name, Variant &r_ret) const {
-
 	String name = p_name;
 
 	if (name == "playback/play") { // bw compatibility
@@ -104,41 +98,36 @@ bool AnimationPlayer::_get(const StringName &p_name, Variant &r_ret) const {
 		r_ret = get_current_animation();
 
 	} else if (name.begins_with("anims/")) {
-
 		String which = name.get_slicec('/', 1);
 		r_ret = get_animation(which);
 
 	} else if (name.begins_with("next/")) {
-
 		String which = name.get_slicec('/', 1);
 
 		r_ret = animation_get_next(which);
 
 	} else if (name == "blend_times") {
-
 		Vector<BlendKey> keys;
 		for (Map<BlendKey, float>::Element *E = blend_times.front(); E; E = E->next()) {
-
 			keys.ordered_insert(E->key());
 		}
 
 		Array array;
 		for (int i = 0; i < keys.size(); i++) {
-
 			array.push_back(keys[i].from);
 			array.push_back(keys[i].to);
 			array.push_back(blend_times[keys[i]]);
 		}
 
 		r_ret = array;
-	} else
+	} else {
 		return false;
+	}
 
 	return true;
 }
 
 void AnimationPlayer::_validate_property(PropertyInfo &property) const {
-
 	if (property.name == "current_animation") {
 		List<String> names;
 
@@ -149,9 +138,9 @@ void AnimationPlayer::_validate_property(PropertyInfo &property) const {
 		names.push_front("[stop]");
 		String hint;
 		for (List<String>::Element *E = names.front(); E; E = E->next()) {
-
-			if (E != names.front())
+			if (E != names.front()) {
 				hint += ",";
+			}
 			hint += E->get();
 		}
 
@@ -160,14 +149,13 @@ void AnimationPlayer::_validate_property(PropertyInfo &property) const {
 }
 
 void AnimationPlayer::_get_property_list(List<PropertyInfo> *p_list) const {
-
 	List<PropertyInfo> anim_names;
 
 	for (Map<StringName, AnimationData>::Element *E = animation_set.front(); E; E = E->next()) {
-
 		anim_names.push_back(PropertyInfo(Variant::OBJECT, "anims/" + String(E->key()), PROPERTY_HINT_RESOURCE_TYPE, "Animation", PROPERTY_USAGE_NOEDITOR | PROPERTY_USAGE_INTERNAL | PROPERTY_USAGE_DO_NOT_SHARE_ON_DUPLICATE));
-		if (E->get().next != StringName())
+		if (E->get().next != StringName()) {
 			anim_names.push_back(PropertyInfo(Variant::STRING, "next/" + String(E->key()), PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NOEDITOR | PROPERTY_USAGE_INTERNAL));
+		}
 	}
 
 	anim_names.sort();
@@ -180,16 +168,12 @@ void AnimationPlayer::_get_property_list(List<PropertyInfo> *p_list) const {
 }
 
 void AnimationPlayer::advance(float p_time) {
-
 	_animation_process(p_time);
 }
 
 void AnimationPlayer::_notification(int p_what) {
-
 	switch (p_what) {
-
 		case NOTIFICATION_ENTER_TREE: {
-
 			if (!processing) {
 				//make sure that a previous process state was not saved
 				//only process if "processing" is set
@@ -200,39 +184,40 @@ void AnimationPlayer::_notification(int p_what) {
 			clear_caches();
 		} break;
 		case NOTIFICATION_READY: {
-
 			if (!Engine::get_singleton()->is_editor_hint() && animation_set.has(autoplay)) {
 				play(autoplay);
 				_animation_process(0);
 			}
 		} break;
 		case NOTIFICATION_INTERNAL_PROCESS: {
-			if (animation_process_mode == ANIMATION_PROCESS_PHYSICS)
+			if (animation_process_mode == ANIMATION_PROCESS_PHYSICS) {
 				break;
+			}
 
-			if (processing)
+			if (processing) {
 				_animation_process(get_process_delta_time());
+			}
 		} break;
 		case NOTIFICATION_INTERNAL_PHYSICS_PROCESS: {
-
-			if (animation_process_mode == ANIMATION_PROCESS_IDLE)
+			if (animation_process_mode == ANIMATION_PROCESS_IDLE) {
 				break;
+			}
 
-			if (processing)
+			if (processing) {
 				_animation_process(get_physics_process_delta_time());
+			}
 		} break;
 		case NOTIFICATION_EXIT_TREE: {
-
 			clear_caches();
 		} break;
 	}
 }
 
 void AnimationPlayer::_ensure_node_caches(AnimationData *p_anim) {
-
 	// Already cached?
-	if (p_anim->node_cache.size() == p_anim->animation->get_track_count())
+	if (p_anim->node_cache.size() == p_anim->animation->get_track_count()) {
 		return;
+	}
 
 	Node *parent = get_node(root);
 
@@ -243,7 +228,6 @@ void AnimationPlayer::_ensure_node_caches(AnimationData *p_anim) {
 	p_anim->node_cache.resize(a->get_track_count());
 
 	for (int i = 0; i < a->get_track_count(); i++) {
-
 		p_anim->node_cache.write[i] = nullptr;
 		RES resource;
 		Vector<StringName> leftover_path;
@@ -253,26 +237,26 @@ void AnimationPlayer::_ensure_node_caches(AnimationData *p_anim) {
 		int bone_idx = -1;
 
 		if (a->track_get_path(i).get_subname_count() == 1 && Object::cast_to<Skeleton3D>(child)) {
-
 			Skeleton3D *sk = Object::cast_to<Skeleton3D>(child);
 			bone_idx = sk->find_bone(a->track_get_path(i).get_subname(0));
 			if (bone_idx == -1) {
-
 				continue;
 			}
 		}
 
 		{
-			if (!child->is_connected("tree_exiting", callable_mp(this, &AnimationPlayer::_node_removed)))
+			if (!child->is_connected("tree_exiting", callable_mp(this, &AnimationPlayer::_node_removed))) {
 				child->connect("tree_exiting", callable_mp(this, &AnimationPlayer::_node_removed), make_binds(child), CONNECT_ONESHOT);
+			}
 		}
 
 		TrackNodeCacheKey key;
 		key.id = id;
 		key.bone_idx = bone_idx;
 
-		if (!node_cache_map.has(key))
+		if (!node_cache_map.has(key)) {
 			node_cache_map[key] = TrackNodeCache();
+		}
 
 		p_anim->node_cache.write[i] = &node_cache_map[key];
 		p_anim->node_cache[i]->path = a->track_get_path(i);
@@ -305,31 +289,27 @@ void AnimationPlayer::_ensure_node_caches(AnimationData *p_anim) {
 		}
 
 		if (a->track_get_type(i) == Animation::TYPE_VALUE) {
-
 			if (!p_anim->node_cache[i]->property_anim.has(a->track_get_path(i).get_concatenated_subnames())) {
-
 				TrackNodeCache::PropertyAnim pa;
 				pa.subpath = leftover_path;
 				pa.object = resource.is_valid() ? (Object *)resource.ptr() : (Object *)child;
 				pa.special = SP_NONE;
 				pa.owner = p_anim->node_cache[i];
 				if (false && p_anim->node_cache[i]->node_2d) {
-
-					if (leftover_path.size() == 1 && leftover_path[0] == SceneStringNames::get_singleton()->transform_pos)
+					if (leftover_path.size() == 1 && leftover_path[0] == SceneStringNames::get_singleton()->transform_pos) {
 						pa.special = SP_NODE2D_POS;
-					else if (leftover_path.size() == 1 && leftover_path[0] == SceneStringNames::get_singleton()->transform_rot)
+					} else if (leftover_path.size() == 1 && leftover_path[0] == SceneStringNames::get_singleton()->transform_rot) {
 						pa.special = SP_NODE2D_ROT;
-					else if (leftover_path.size() == 1 && leftover_path[0] == SceneStringNames::get_singleton()->transform_scale)
+					} else if (leftover_path.size() == 1 && leftover_path[0] == SceneStringNames::get_singleton()->transform_scale) {
 						pa.special = SP_NODE2D_SCALE;
+					}
 				}
 				p_anim->node_cache[i]->property_anim[a->track_get_path(i).get_concatenated_subnames()] = pa;
 			}
 		}
 
 		if (a->track_get_type(i) == Animation::TYPE_BEZIER && leftover_path.size()) {
-
 			if (!p_anim->node_cache[i]->bezier_anim.has(a->track_get_path(i).get_concatenated_subnames())) {
-
 				TrackNodeCache::BezierAnim ba;
 				ba.bezier_property = leftover_path;
 				ba.object = resource.is_valid() ? (Object *)resource.ptr() : (Object *)child;
@@ -342,7 +322,6 @@ void AnimationPlayer::_ensure_node_caches(AnimationData *p_anim) {
 }
 
 void AnimationPlayer::_animation_process_animation(AnimationData *p_anim, float p_time, float p_delta, float p_interp, bool p_is_current, bool p_seeked, bool p_started) {
-
 	_ensure_node_caches(p_anim);
 	ERR_FAIL_COND(p_anim->node_cache.size() != p_anim->animation->get_track_count());
 
@@ -350,7 +329,6 @@ void AnimationPlayer::_animation_process_animation(AnimationData *p_anim, float
 	bool can_call = is_inside_tree() && !Engine::get_singleton()->is_editor_hint();
 
 	for (int i = 0; i < a->get_track_count(); i++) {
-
 		// If an animation changes this animation (or it animates itself)
 		// we need to recreate our animation cache
 		if (p_anim->node_cache.size() != a->get_track_count()) {
@@ -359,21 +337,23 @@ void AnimationPlayer::_animation_process_animation(AnimationData *p_anim, float
 
 		TrackNodeCache *nc = p_anim->node_cache[i];
 
-		if (!nc)
+		if (!nc) {
 			continue; // no node cache for this track, skip it
+		}
 
-		if (!a->track_is_enabled(i))
+		if (!a->track_is_enabled(i)) {
 			continue; // do nothing if the track is disabled
+		}
 
-		if (a->track_get_key_count(i) == 0)
+		if (a->track_get_key_count(i) == 0) {
 			continue; // do nothing if track is empty
+		}
 
 		switch (a->track_get_type(i)) {
-
 			case Animation::TYPE_TRANSFORM: {
-
-				if (!nc->spatial)
+				if (!nc->spatial) {
 					continue;
+				}
 
 				Vector3 loc;
 				Quat rot;
@@ -382,8 +362,9 @@ void AnimationPlayer::_animation_process_animation(AnimationData *p_anim, float
 				Error err = a->transform_track_interpolate(i, p_time, &loc, &rot, &scale);
 				//ERR_CONTINUE(err!=OK); //used for testing, should be removed
 
-				if (err != OK)
+				if (err != OK) {
 					continue;
+				}
 
 				if (nc->accum_pass != accum_pass) {
 					ERR_CONTINUE(cache_update_size >= NODE_CACHE_UPDATE_MAX);
@@ -394,17 +375,16 @@ void AnimationPlayer::_animation_process_animation(AnimationData *p_anim, float
 					nc->scale_accum = scale;
 
 				} else {
-
-					nc->loc_accum = nc->loc_accum.linear_interpolate(loc, p_interp);
+					nc->loc_accum = nc->loc_accum.lerp(loc, p_interp);
 					nc->rot_accum = nc->rot_accum.slerp(rot, p_interp);
-					nc->scale_accum = nc->scale_accum.linear_interpolate(scale, p_interp);
+					nc->scale_accum = nc->scale_accum.lerp(scale, p_interp);
 				}
 
 			} break;
 			case Animation::TYPE_VALUE: {
-
-				if (!nc->node)
+				if (!nc->node) {
 					continue;
+				}
 
 				//StringName property=a->track_get_path(i).get_property();
 
@@ -416,14 +396,14 @@ void AnimationPlayer::_animation_process_animation(AnimationData *p_anim, float
 				Animation::UpdateMode update_mode = a->value_track_get_update_mode(i);
 
 				if (update_mode == Animation::UPDATE_CAPTURE) {
-
 					if (p_started) {
 						pa->capture = pa->object->get_indexed(pa->subpath);
 					}
 
 					int key_count = a->track_get_key_count(i);
-					if (key_count == 0)
+					if (key_count == 0) {
 						continue; //eeh not worth it
+					}
 
 					float first_key_time = a->track_get_key_time(i, 0);
 					float transition = 1.0;
@@ -431,8 +411,9 @@ void AnimationPlayer::_animation_process_animation(AnimationData *p_anim, float
 
 					if (first_key_time == 0.0) {
 						//ignore, use for transition
-						if (key_count == 1)
+						if (key_count == 1) {
 							continue; //with one key we can't do anything
+						}
 						transition = a->track_get_key_transition(i, 0);
 						first_key_time = a->track_get_key_time(i, 1);
 						first_key = 1;
@@ -461,8 +442,9 @@ void AnimationPlayer::_animation_process_animation(AnimationData *p_anim, float
 
 					Variant value = a->value_track_interpolate(i, p_time);
 
-					if (value == Variant())
+					if (value == Variant()) {
 						continue;
+					}
 
 					//thanks to trigger mode, this should be solved now..
 					/*
@@ -479,15 +461,12 @@ void AnimationPlayer::_animation_process_animation(AnimationData *p_anim, float
 					}
 
 				} else if (p_is_current && p_delta != 0) {
-
 					List<int> indices;
 					a->value_track_get_key_indices(i, p_time, p_delta, &indices);
 
 					for (List<int>::Element *F = indices.front(); F; F = F->next()) {
-
 						Variant value = a->track_get_key_value(i, F->get());
 						switch (pa->special) {
-
 							case SP_NONE: {
 								bool valid;
 								pa->object->set_indexed(pa->subpath, value, &valid); //you are not speshul
@@ -530,21 +509,21 @@ void AnimationPlayer::_animation_process_animation(AnimationData *p_anim, float
 
 			} break;
 			case Animation::TYPE_METHOD: {
-
-				if (!nc->node)
+				if (!nc->node) {
 					continue;
+				}
 				if (p_delta == 0) {
 					continue;
 				}
-				if (!p_is_current)
+				if (!p_is_current) {
 					break;
+				}
 
 				List<int> indices;
 
 				a->method_track_get_key_indices(i, p_time, p_delta, &indices);
 
 				for (List<int>::Element *E = indices.front(); E; E = E->next()) {
-
 					StringName method = a->method_track_get_name(i, E->get());
 					Vector<Variant> params = a->method_track_get_params(i, E->get());
 
@@ -581,9 +560,9 @@ void AnimationPlayer::_animation_process_animation(AnimationData *p_anim, float
 
 			} break;
 			case Animation::TYPE_BEZIER: {
-
-				if (!nc->node)
+				if (!nc->node) {
 					continue;
+				}
 
 				Map<StringName, TrackNodeCache::BezierAnim>::Element *E = nc->bezier_anim.find(a->track_get_path(i).get_concatenated_subnames());
 				ERR_CONTINUE(!E); //should it continue, or create a new one?
@@ -602,9 +581,9 @@ void AnimationPlayer::_animation_process_animation(AnimationData *p_anim, float
 
 			} break;
 			case Animation::TYPE_AUDIO: {
-
-				if (!nc->node)
+				if (!nc->node) {
 					continue;
+				}
 				if (p_delta == 0) {
 					continue;
 				}
@@ -612,8 +591,9 @@ void AnimationPlayer::_animation_process_animation(AnimationData *p_anim, float
 				if (p_seeked) {
 					//find whathever should be playing
 					int idx = a->track_find_key(i, p_time);
-					if (idx < 0)
+					if (idx < 0) {
 						continue;
+					}
 
 					Ref<AudioStream> stream = a->audio_track_get_key_stream(i, idx);
 					if (!stream.is_valid()) {
@@ -678,7 +658,6 @@ void AnimationPlayer::_animation_process_animation(AnimationData *p_anim, float
 							nc->audio_start = p_time;
 						}
 					} else if (nc->audio_playing) {
-
 						bool loop = a->has_loop();
 
 						bool stop = false;
@@ -704,22 +683,24 @@ void AnimationPlayer::_animation_process_animation(AnimationData *p_anim, float
 
 			} break;
 			case Animation::TYPE_ANIMATION: {
-
 				AnimationPlayer *player = Object::cast_to<AnimationPlayer>(nc->node);
-				if (!player)
+				if (!player) {
 					continue;
+				}
 
 				if (p_delta == 0 || p_seeked) {
 					//seek
 					int idx = a->track_find_key(i, p_time);
-					if (idx < 0)
+					if (idx < 0) {
 						continue;
+					}
 
 					float pos = a->track_get_key_time(i, idx);
 
 					StringName anim_name = a->animation_track_get_key_animation(i, idx);
-					if (String(anim_name) == "[stop]" || !player->has_animation(anim_name))
+					if (String(anim_name) == "[stop]" || !player->has_animation(anim_name)) {
 						continue;
+					}
 
 					Ref<Animation> anim = player->get_animation(anim_name);
 
@@ -749,7 +730,6 @@ void AnimationPlayer::_animation_process_animation(AnimationData *p_anim, float
 
 						StringName anim_name = a->animation_track_get_key_animation(i, idx);
 						if (String(anim_name) == "[stop]" || !player->has_animation(anim_name)) {
-
 							if (playing_caches.has(nc)) {
 								playing_caches.erase(nc);
 								player->stop();
@@ -769,7 +749,6 @@ void AnimationPlayer::_animation_process_animation(AnimationData *p_anim, float
 }
 
 void AnimationPlayer::_animation_process_data(PlaybackData &cd, float p_delta, float p_blend, bool p_seeked, bool p_started) {
-
 	float delta = p_delta * speed_scale * cd.speed_scale;
 	float next_pos = cd.pos + delta;
 
@@ -777,17 +756,16 @@ void AnimationPlayer::_animation_process_data(PlaybackData &cd, float p_delta, f
 	bool loop = cd.from->animation->has_loop();
 
 	if (!loop) {
-
-		if (next_pos < 0)
+		if (next_pos < 0) {
 			next_pos = 0;
-		else if (next_pos > len)
+		} else if (next_pos > len) {
 			next_pos = len;
+		}
 
 		// fix delta
 		delta = next_pos - cd.pos;
 
 		if (&cd == &playback.current) {
-
 			bool backwards = delta < 0;
 
 			if (!backwards && cd.pos <= len && next_pos == len /*&& playback.blend.empty()*/) {
@@ -804,7 +782,6 @@ void AnimationPlayer::_animation_process_data(PlaybackData &cd, float p_delta, f
 		}
 
 	} else {
-
 		float looped_next_pos = Math::fposmod(next_pos, len);
 		if (looped_next_pos == 0 && next_pos != 0) {
 			// Loop multiples of the length to it, rather than 0
@@ -819,8 +796,8 @@ void AnimationPlayer::_animation_process_data(PlaybackData &cd, float p_delta, f
 
 	_animation_process_animation(cd.from, cd.pos, delta, p_blend, &cd == &playback.current, p_seeked, p_started);
 }
-void AnimationPlayer::_animation_process2(float p_delta, bool p_started) {
 
+void AnimationPlayer::_animation_process2(float p_delta, bool p_started) {
 	Playback &c = playback;
 
 	accum_pass++;
@@ -832,7 +809,6 @@ void AnimationPlayer::_animation_process2(float p_delta, bool p_started) {
 
 	List<Blend>::Element *prev = nullptr;
 	for (List<Blend>::Element *E = c.blend.back(); E; E = prev) {
-
 		Blend &b = E->get();
 		float blend = b.blend_left / b.blend_time;
 		_animation_process_data(b.data, p_delta, blend, false, false);
@@ -841,7 +817,6 @@ void AnimationPlayer::_animation_process2(float p_delta, bool p_started) {
 
 		prev = E->prev();
 		if (b.blend_left < 0) {
-
 			c.blend.erase(E);
 		}
 	}
@@ -851,7 +826,6 @@ void AnimationPlayer::_animation_update_transforms() {
 	{
 		Transform t;
 		for (int i = 0; i < cache_update_size; i++) {
-
 			TrackNodeCache *nc = cache_update[i];
 
 			ERR_CONTINUE(nc->accum_pass != accum_pass);
@@ -859,11 +833,9 @@ void AnimationPlayer::_animation_update_transforms() {
 			t.origin = nc->loc_accum;
 			t.basis.set_quat_scale(nc->rot_accum, nc->scale_accum);
 			if (nc->skeleton && nc->bone_idx >= 0) {
-
 				nc->skeleton->set_bone_pose(nc->bone_idx, t);
 
 			} else if (nc->spatial) {
-
 				nc->spatial->set_transform(t);
 			}
 		}
@@ -872,13 +844,11 @@ void AnimationPlayer::_animation_update_transforms() {
 	cache_update_size = 0;
 
 	for (int i = 0; i < cache_update_prop_size; i++) {
-
 		TrackNodeCache::PropertyAnim *pa = cache_update_prop[i];
 
 		ERR_CONTINUE(pa->accum_pass != accum_pass);
 
 		switch (pa->special) {
-
 			case SP_NONE: {
 				bool valid;
 				pa->object->set_indexed(pa->subpath, pa->value_accum, &valid); //you are not speshul
@@ -921,7 +891,6 @@ void AnimationPlayer::_animation_update_transforms() {
 	cache_update_prop_size = 0;
 
 	for (int i = 0; i < cache_update_bezier_size; i++) {
-
 		TrackNodeCache::BezierAnim *ba = cache_update_bezier[i];
 
 		ERR_CONTINUE(ba->accum_pass != accum_pass);
@@ -932,9 +901,7 @@ void AnimationPlayer::_animation_update_transforms() {
 }
 
 void AnimationPlayer::_animation_process(float p_delta) {
-
 	if (playback.current.from) {
-
 		end_reached = false;
 		end_notify = false;
 		_animation_process2(p_delta, playback.started);
@@ -950,14 +917,16 @@ void AnimationPlayer::_animation_process(float p_delta) {
 				play(queued.front()->get());
 				String new_name = playback.assigned;
 				queued.pop_front();
-				if (end_notify)
+				if (end_notify) {
 					emit_signal(SceneStringNames::get_singleton()->animation_changed, old, new_name);
+				}
 			} else {
 				//stop();
 				playing = false;
 				_set_process(false);
-				if (end_notify)
+				if (end_notify) {
 					emit_signal(SceneStringNames::get_singleton()->animation_finished, playback.assigned);
+				}
 			}
 			end_reached = false;
 		}
@@ -968,7 +937,6 @@ void AnimationPlayer::_animation_process(float p_delta) {
 }
 
 Error AnimationPlayer::add_animation(const StringName &p_name, const Ref<Animation> &p_animation) {
-
 #ifdef DEBUG_ENABLED
 	ERR_FAIL_COND_V_MSG(String(p_name).find("/") != -1 || String(p_name).find(":") != -1 || String(p_name).find(",") != -1 || String(p_name).find("[") != -1, ERR_INVALID_PARAMETER, "Invalid animation name: " + String(p_name) + ".");
 #endif
@@ -976,12 +944,10 @@ Error AnimationPlayer::add_animation(const StringName &p_name, const Ref<Animati
 	ERR_FAIL_COND_V(p_animation.is_null(), ERR_INVALID_PARAMETER);
 
 	if (animation_set.has(p_name)) {
-
 		_unref_anim(animation_set[p_name].animation);
 		animation_set[p_name].animation = p_animation;
 		clear_caches();
 	} else {
-
 		AnimationData ad;
 		ad.animation = p_animation;
 		ad.name = p_name;
@@ -994,7 +960,6 @@ Error AnimationPlayer::add_animation(const StringName &p_name, const Ref<Animati
 }
 
 void AnimationPlayer::remove_animation(const StringName &p_name) {
-
 	ERR_FAIL_COND(!animation_set.has(p_name));
 
 	stop();
@@ -1006,17 +971,14 @@ void AnimationPlayer::remove_animation(const StringName &p_name) {
 }
 
 void AnimationPlayer::_ref_anim(const Ref<Animation> &p_anim) {
-
 	Ref<Animation>(p_anim)->connect(SceneStringNames::get_singleton()->tracks_changed, callable_mp(this, &AnimationPlayer::_animation_changed), varray(), CONNECT_REFERENCE_COUNTED);
 }
 
 void AnimationPlayer::_unref_anim(const Ref<Animation> &p_anim) {
-
 	Ref<Animation>(p_anim)->disconnect(SceneStringNames::get_singleton()->tracks_changed, callable_mp(this, &AnimationPlayer::_animation_changed));
 }
 
 void AnimationPlayer::rename_animation(const StringName &p_name, const StringName &p_new_name) {
-
 	ERR_FAIL_COND(!animation_set.has(p_name));
 	ERR_FAIL_COND(String(p_new_name).find("/") != -1 || String(p_new_name).find(":") != -1);
 	ERR_FAIL_COND(animation_set.has(p_new_name));
@@ -1030,7 +992,6 @@ void AnimationPlayer::rename_animation(const StringName &p_name, const StringNam
 	List<BlendKey> to_erase;
 	Map<BlendKey, float> to_insert;
 	for (Map<BlendKey, float>::Element *E = blend_times.front(); E; E = E->next()) {
-
 		BlendKey bk = E->key();
 		BlendKey new_bk = bk;
 		bool erase = false;
@@ -1050,7 +1011,6 @@ void AnimationPlayer::rename_animation(const StringName &p_name, const StringNam
 	}
 
 	while (to_erase.size()) {
-
 		blend_times.erase(to_erase.front()->get());
 		to_erase.pop_front();
 	}
@@ -1060,73 +1020,71 @@ void AnimationPlayer::rename_animation(const StringName &p_name, const StringNam
 		to_insert.erase(to_insert.front());
 	}
 
-	if (autoplay == p_name)
+	if (autoplay == p_name) {
 		autoplay = p_new_name;
+	}
 
 	clear_caches();
 	_change_notify();
 }
 
 bool AnimationPlayer::has_animation(const StringName &p_name) const {
-
 	return animation_set.has(p_name);
 }
-Ref<Animation> AnimationPlayer::get_animation(const StringName &p_name) const {
 
+Ref<Animation> AnimationPlayer::get_animation(const StringName &p_name) const {
 	ERR_FAIL_COND_V(!animation_set.has(p_name), Ref<Animation>());
 
 	const AnimationData &data = animation_set[p_name];
 
 	return data.animation;
 }
-void AnimationPlayer::get_animation_list(List<StringName> *p_animations) const {
 
+void AnimationPlayer::get_animation_list(List<StringName> *p_animations) const {
 	List<String> anims;
 
 	for (Map<StringName, AnimationData>::Element *E = animation_set.front(); E; E = E->next()) {
-
 		anims.push_back(E->key());
 	}
 
 	anims.sort();
 
 	for (List<String>::Element *E = anims.front(); E; E = E->next()) {
-
 		p_animations->push_back(E->get());
 	}
 }
 
 void AnimationPlayer::set_blend_time(const StringName &p_animation1, const StringName &p_animation2, float p_time) {
-
 	ERR_FAIL_COND_MSG(p_time < 0, "Blend time cannot be smaller than 0.");
 
 	BlendKey bk;
 	bk.from = p_animation1;
 	bk.to = p_animation2;
-	if (p_time == 0)
+	if (p_time == 0) {
 		blend_times.erase(bk);
-	else
+	} else {
 		blend_times[bk] = p_time;
+	}
 }
 
 float AnimationPlayer::get_blend_time(const StringName &p_animation1, const StringName &p_animation2) const {
-
 	BlendKey bk;
 	bk.from = p_animation1;
 	bk.to = p_animation2;
 
-	if (blend_times.has(bk))
+	if (blend_times.has(bk)) {
 		return blend_times[bk];
-	else
+	} else {
 		return 0;
+	}
 }
 
 void AnimationPlayer::queue(const StringName &p_name) {
-
-	if (!is_playing())
+	if (!is_playing()) {
 		play(p_name);
-	else
+	} else {
 		queued.push_back(p_name);
+	}
 }
 
 Vector<String> AnimationPlayer::get_queue() {
@@ -1143,23 +1101,21 @@ void AnimationPlayer::clear_queue() {
 }
 
 void AnimationPlayer::play_backwards(const StringName &p_name, float p_custom_blend) {
-
 	play(p_name, p_custom_blend, -1, true);
 }
 
 void AnimationPlayer::play(const StringName &p_name, float p_custom_blend, float p_custom_scale, bool p_from_end) {
-
 	StringName name = p_name;
 
-	if (String(name) == "")
+	if (String(name) == "") {
 		name = playback.assigned;
+	}
 
 	ERR_FAIL_COND_MSG(!animation_set.has(name), "Animation not found: " + name + ".");
 
 	Playback &c = playback;
 
 	if (c.current.from) {
-
 		float blend_time = 0;
 		// find if it can blend
 		BlendKey bk;
@@ -1169,30 +1125,25 @@ void AnimationPlayer::play(const StringName &p_name, float p_custom_blend, float
 		if (p_custom_blend >= 0) {
 			blend_time = p_custom_blend;
 		} else if (blend_times.has(bk)) {
-
 			blend_time = blend_times[bk];
 		} else {
-
 			bk.from = "*";
 			if (blend_times.has(bk)) {
-
 				blend_time = blend_times[bk];
 			} else {
-
 				bk.from = c.current.from->name;
 				bk.to = "*";
 
 				if (blend_times.has(bk)) {
-
 					blend_time = blend_times[bk];
 				}
 			}
 		}
 
-		if (p_custom_blend < 0 && blend_time == 0 && default_blend_time)
+		if (p_custom_blend < 0 && blend_time == 0 && default_blend_time) {
 			blend_time = default_blend_time;
+		}
 		if (blend_time > 0) {
-
 			Blend b;
 			b.data = c.current;
 			b.blend_time = b.blend_left = blend_time;
@@ -1223,15 +1174,17 @@ void AnimationPlayer::play(const StringName &p_name, float p_custom_blend, float
 	c.seeked = false;
 	c.started = true;
 
-	if (!end_reached)
+	if (!end_reached) {
 		queued.clear();
+	}
 	_set_process(true); // always process when starting an animation
 	playing = true;
 
 	emit_signal(SceneStringNames::get_singleton()->animation_started, c.assigned);
 
-	if (is_inside_tree() && Engine::get_singleton()->is_editor_hint())
+	if (is_inside_tree() && Engine::get_singleton()->is_editor_hint()) {
 		return; // no next in this case
+	}
 
 	StringName next = animation_get_next(p_name);
 	if (next != StringName() && animation_set.has(next)) {
@@ -1240,12 +1193,10 @@ void AnimationPlayer::play(const StringName &p_name, float p_custom_blend, float
 }
 
 bool AnimationPlayer::is_playing() const {
-
 	return playing;
 }
 
 void AnimationPlayer::set_current_animation(const String &p_anim) {
-
 	if (p_anim == "[stop]" || p_anim == "") {
 		stop();
 	} else if (!is_playing() || playback.assigned != p_anim) {
@@ -1256,12 +1207,10 @@ void AnimationPlayer::set_current_animation(const String &p_anim) {
 }
 
 String AnimationPlayer::get_current_animation() const {
-
 	return (is_playing() ? playback.assigned : "");
 }
 
 void AnimationPlayer::set_assigned_animation(const String &p_anim) {
-
 	if (is_playing()) {
 		play(p_anim);
 	} else {
@@ -1273,12 +1222,10 @@ void AnimationPlayer::set_assigned_animation(const String &p_anim) {
 }
 
 String AnimationPlayer::get_assigned_animation() const {
-
 	return playback.assigned;
 }
 
 void AnimationPlayer::stop(bool p_reset) {
-
 	_stop_playing_caches();
 	Playback &c = playback;
 	c.blend.clear();
@@ -1293,15 +1240,14 @@ void AnimationPlayer::stop(bool p_reset) {
 }
 
 void AnimationPlayer::set_speed_scale(float p_speed) {
-
 	speed_scale = p_speed;
 }
-float AnimationPlayer::get_speed_scale() const {
 
+float AnimationPlayer::get_speed_scale() const {
 	return speed_scale;
 }
-float AnimationPlayer::get_playing_speed() const {
 
+float AnimationPlayer::get_playing_speed() const {
 	if (!playing) {
 		return 0;
 	}
@@ -1309,7 +1255,6 @@ float AnimationPlayer::get_playing_speed() const {
 }
 
 void AnimationPlayer::seek(float p_time, bool p_update) {
-
 	if (!playback.current.from) {
 		if (playback.assigned) {
 			ERR_FAIL_COND(!animation_set.has(playback.assigned));
@@ -1326,7 +1271,6 @@ void AnimationPlayer::seek(float p_time, bool p_update) {
 }
 
 void AnimationPlayer::seek_delta(float p_time, float p_delta) {
-
 	if (!playback.current.from) {
 		if (playback.assigned) {
 			ERR_FAIL_COND(!animation_set.has(playback.assigned));
@@ -1336,31 +1280,28 @@ void AnimationPlayer::seek_delta(float p_time, float p_delta) {
 	}
 
 	playback.current.pos = p_time - p_delta;
-	if (speed_scale != 0.0)
+	if (speed_scale != 0.0) {
 		p_delta /= speed_scale;
+	}
 	_animation_process(p_delta);
 	//playback.current.pos=p_time;
 }
 
 bool AnimationPlayer::is_valid() const {
-
 	return (playback.current.from);
 }
 
 float AnimationPlayer::get_current_animation_position() const {
-
 	ERR_FAIL_COND_V(!playback.current.from, 0);
 	return playback.current.pos;
 }
 
 float AnimationPlayer::get_current_animation_length() const {
-
 	ERR_FAIL_COND_V(!playback.current.from, 0);
 	return playback.current.from->animation->get_length();
 }
 
 void AnimationPlayer::_animation_changed() {
-
 	clear_caches();
 	emit_signal("caches_cleared");
 	if (is_playing()) {
@@ -1369,16 +1310,15 @@ void AnimationPlayer::_animation_changed() {
 }
 
 void AnimationPlayer::_stop_playing_caches() {
-
 	for (Set<TrackNodeCache *>::Element *E = playing_caches.front(); E; E = E->next()) {
-
 		if (E->get()->node && E->get()->audio_playing) {
 			E->get()->node->call("stop");
 		}
 		if (E->get()->node && E->get()->animation_playing) {
 			AnimationPlayer *player = Object::cast_to<AnimationPlayer>(E->get()->node);
-			if (!player)
+			if (!player) {
 				continue;
+			}
 			player->stop();
 		}
 	}
@@ -1387,18 +1327,15 @@ void AnimationPlayer::_stop_playing_caches() {
 }
 
 void AnimationPlayer::_node_removed(Node *p_node) {
-
 	clear_caches(); // nodes contained here ar being removed, clear the caches
 }
 
 void AnimationPlayer::clear_caches() {
-
 	_stop_playing_caches();
 
 	node_cache_map.clear();
 
 	for (Map<StringName, AnimationData>::Element *E = animation_set.front(); E; E = E->next()) {
-
 		E->get().node_cache.clear();
 	}
 
@@ -1408,121 +1345,116 @@ void AnimationPlayer::clear_caches() {
 }
 
 void AnimationPlayer::set_active(bool p_active) {
-
-	if (active == p_active)
+	if (active == p_active) {
 		return;
+	}
 
 	active = p_active;
 	_set_process(processing, true);
 }
 
 bool AnimationPlayer::is_active() const {
-
 	return active;
 }
 
 StringName AnimationPlayer::find_animation(const Ref<Animation> &p_animation) const {
-
 	for (Map<StringName, AnimationData>::Element *E = animation_set.front(); E; E = E->next()) {
-
-		if (E->get().animation == p_animation)
+		if (E->get().animation == p_animation) {
 			return E->key();
+		}
 	}
 
 	return "";
 }
 
 void AnimationPlayer::set_autoplay(const String &p_name) {
-	if (is_inside_tree() && !Engine::get_singleton()->is_editor_hint())
+	if (is_inside_tree() && !Engine::get_singleton()->is_editor_hint()) {
 		WARN_PRINT("Setting autoplay after the node has been added to the scene has no effect.");
+	}
 
 	autoplay = p_name;
 }
 
 String AnimationPlayer::get_autoplay() const {
-
 	return autoplay;
 }
 
 void AnimationPlayer::set_animation_process_mode(AnimationProcessMode p_mode) {
-
-	if (animation_process_mode == p_mode)
+	if (animation_process_mode == p_mode) {
 		return;
+	}
 
 	bool pr = processing;
-	if (pr)
+	if (pr) {
 		_set_process(false);
+	}
 	animation_process_mode = p_mode;
-	if (pr)
+	if (pr) {
 		_set_process(true);
+	}
 }
 
 AnimationPlayer::AnimationProcessMode AnimationPlayer::get_animation_process_mode() const {
-
 	return animation_process_mode;
 }
 
 void AnimationPlayer::set_method_call_mode(AnimationMethodCallMode p_mode) {
-
 	method_call_mode = p_mode;
 }
 
 AnimationPlayer::AnimationMethodCallMode AnimationPlayer::get_method_call_mode() const {
-
 	return method_call_mode;
 }
 
 void AnimationPlayer::_set_process(bool p_process, bool p_force) {
-
-	if (processing == p_process && !p_force)
+	if (processing == p_process && !p_force) {
 		return;
+	}
 
 	switch (animation_process_mode) {
-
-		case ANIMATION_PROCESS_PHYSICS: set_physics_process_internal(p_process && active); break;
-		case ANIMATION_PROCESS_IDLE: set_process_internal(p_process && active); break;
-		case ANIMATION_PROCESS_MANUAL: break;
+		case ANIMATION_PROCESS_PHYSICS:
+			set_physics_process_internal(p_process && active);
+			break;
+		case ANIMATION_PROCESS_IDLE:
+			set_process_internal(p_process && active);
+			break;
+		case ANIMATION_PROCESS_MANUAL:
+			break;
 	}
 
 	processing = p_process;
 }
 
 void AnimationPlayer::animation_set_next(const StringName &p_animation, const StringName &p_next) {
-
 	ERR_FAIL_COND(!animation_set.has(p_animation));
 	animation_set[p_animation].next = p_next;
 }
 
 StringName AnimationPlayer::animation_get_next(const StringName &p_animation) const {
-
-	if (!animation_set.has(p_animation))
+	if (!animation_set.has(p_animation)) {
 		return StringName();
+	}
 	return animation_set[p_animation].next;
 }
 
 void AnimationPlayer::set_default_blend_time(float p_default) {
-
 	default_blend_time = p_default;
 }
 
 float AnimationPlayer::get_default_blend_time() const {
-
 	return default_blend_time;
 }
 
 void AnimationPlayer::set_root(const NodePath &p_root) {
-
 	root = p_root;
 	clear_caches();
 }
 
 NodePath AnimationPlayer::get_root() const {
-
 	return root;
 }
 
 void AnimationPlayer::get_argument_options(const StringName &p_function, int p_idx, List<String> *r_options) const {
-
 #ifdef TOOLS_ENABLED
 	const String quote_style = EDITOR_DEF("text_editor/completion/use_single_quotes", 0) ? "'" : "\"";
 #else
@@ -1534,7 +1466,6 @@ void AnimationPlayer::get_argument_options(const StringName &p_function, int p_i
 		List<StringName> al;
 		get_animation_list(&al);
 		for (List<StringName>::Element *E = al.front(); E; E = E->next()) {
-
 			r_options->push_back(quote_style + String(E->get()) + quote_style);
 		}
 	}
@@ -1543,9 +1474,9 @@ void AnimationPlayer::get_argument_options(const StringName &p_function, int p_i
 
 #ifdef TOOLS_ENABLED
 AnimatedValuesBackup AnimationPlayer::backup_animated_values() {
-
-	if (!playback.current.from)
+	if (!playback.current.from) {
 		return AnimatedValuesBackup();
+	}
 
 	_ensure_node_caches(playback.current.from);
 
@@ -1553,12 +1484,14 @@ AnimatedValuesBackup AnimationPlayer::backup_animated_values() {
 
 	for (int i = 0; i < playback.current.from->node_cache.size(); i++) {
 		TrackNodeCache *nc = playback.current.from->node_cache[i];
-		if (!nc)
+		if (!nc) {
 			continue;
+		}
 
 		if (nc->skeleton) {
-			if (nc->bone_idx == -1)
+			if (nc->bone_idx == -1) {
 				continue;
+			}
 
 			AnimatedValuesBackup::Entry entry;
 			entry.object = nc->skeleton;
@@ -1581,8 +1514,9 @@ AnimatedValuesBackup AnimationPlayer::backup_animated_values() {
 					bool valid;
 					entry.value = E->value().object->get_indexed(E->value().subpath, &valid);
 					entry.bone_idx = -1;
-					if (valid)
+					if (valid) {
 						backup.entries.push_back(entry);
+					}
 				}
 			}
 		}
@@ -1592,9 +1526,7 @@ AnimatedValuesBackup AnimationPlayer::backup_animated_values() {
 }
 
 void AnimationPlayer::restore_animated_values(const AnimatedValuesBackup &p_backup) {
-
 	for (int i = 0; i < p_backup.entries.size(); i++) {
-
 		const AnimatedValuesBackup::Entry *entry = &p_backup.entries[i];
 		if (entry->bone_idx == -1) {
 			entry->object->set_indexed(entry->subpath, entry->value);
@@ -1692,7 +1624,6 @@ void AnimationPlayer::_bind_methods() {
 }
 
 AnimationPlayer::AnimationPlayer() {
-
 	accum_pass = 1;
 	cache_update_size = 0;
 	cache_update_prop_size = 0;