4 files changed, 32 insertions, 2 deletions
diff --git a/scene/animation/animation_blend_tree.cpp b/scene/animation/animation_blend_tree.cpp
index a343a4f0ed..0daa574f72 100644
--- a/scene/animation/animation_blend_tree.cpp
+++ b/scene/animation/animation_blend_tree.cpp
@@ -141,10 +141,14 @@ void AnimationNodeOneShot::get_parameter_list(List<PropertyInfo> *r_list) const
 	r_list->push_back(PropertyInfo(Variant::BOOL, prev_active, PROPERTY_HINT_NONE, "", 0));
 	r_list->push_back(PropertyInfo(Variant::REAL, time, PROPERTY_HINT_NONE, "", 0));
 	r_list->push_back(PropertyInfo(Variant::REAL, remaining, PROPERTY_HINT_NONE, "", 0));
+	r_list->push_back(PropertyInfo(Variant::REAL, time_to_restart, PROPERTY_HINT_NONE, "", 0));
 }
+
 Variant AnimationNodeOneShot::get_parameter_default_value(const StringName &p_parameter) const {
 	if (p_parameter == active || p_parameter == prev_active) {
 		return false;
+	} else if (p_parameter == time_to_restart) {
+		return -1;
 	} else {
 		return 0.0;
 	}
@@ -218,13 +222,26 @@ float AnimationNodeOneShot::process(float p_time, bool p_seek) {
 	bool prev_active = get_parameter(this->prev_active);
 	float time = get_parameter(this->time);
 	float remaining = get_parameter(this->remaining);
+	float time_to_restart = get_parameter(this->time_to_restart);
 
 	if (!active) {
 		//make it as if this node doesn't exist, pass input 0 by.
 		if (prev_active) {
 			set_parameter(this->prev_active, false);
 		}
-		return blend_input(0, p_time, p_seek, 1.0, FILTER_IGNORE, !sync);
+		if (time_to_restart >= 0.0 && !p_seek) {
+			time_to_restart -= p_time;
+			if (time_to_restart < 0) {
+				//restart
+				set_parameter(this->active, true);
+				active = true;
+			}
+			set_parameter(this->time_to_restart, time_to_restart);
+		}
+
+		if (!active) {
+			return blend_input(0, p_time, p_seek, 1.0, FILTER_IGNORE, !sync);
+		}
 	}
 
 	bool os_seek = p_seek;
@@ -276,6 +293,10 @@ float AnimationNodeOneShot::process(float p_time, bool p_seek) {
 		if (remaining <= 0) {
 			set_parameter(this->active, false);
 			set_parameter(this->prev_active, false);
+			if (autorestart) {
+				float restart_sec = autorestart_delay + Math::randf() * autorestart_random_delay;
+				set_parameter(this->time_to_restart, restart_sec);
+			}
 		}
 	}
 
@@ -350,6 +371,7 @@ AnimationNodeOneShot::AnimationNodeOneShot() {
 	prev_active = "prev_active";
 	time = "time";
 	remaining = "remaining";
+	time_to_restart = "time_to_restart";
 }
 
 ////////////////////////////////////////////////
diff --git a/scene/animation/animation_blend_tree.h b/scene/animation/animation_blend_tree.h
index e207713134..c16dcb1b8c 100644
--- a/scene/animation/animation_blend_tree.h
+++ b/scene/animation/animation_blend_tree.h
@@ -91,6 +91,7 @@ private:
 	StringName prev_active;
 	StringName time;
 	StringName remaining;
+	StringName time_to_restart;
 
 protected:
 	static void _bind_methods();
diff --git a/scene/animation/animation_node_state_machine.cpp b/scene/animation/animation_node_state_machine.cpp
index 56faba27cf..08cc655cdd 100644
--- a/scene/animation/animation_node_state_machine.cpp
+++ b/scene/animation/animation_node_state_machine.cpp
@@ -373,7 +373,7 @@ float AnimationNodeStateMachinePlayback::process(AnimationNodeStateMachine *sm,
 
 	if (fading_from != StringName()) {
 
-		sm->blend_node(current, sm->states[fading_from].node, p_time, p_seek, 1.0 - fade_blend, AnimationNode::FILTER_IGNORE, false);
+		sm->blend_node(fading_from, sm->states[fading_from].node, p_time, p_seek, 1.0 - fade_blend, AnimationNode::FILTER_IGNORE, false);
 	}
 
 	//guess playback position
diff --git a/scene/animation/animation_tree.cpp b/scene/animation/animation_tree.cpp
index 706717a8e3..c32001dbcd 100644
--- a/scene/animation/animation_tree.cpp
+++ b/scene/animation/animation_tree.cpp
@@ -685,6 +685,10 @@ bool AnimationTree::_update_caches(AnimationPlayer *player) {
 						track = track_animation;
 
 					} break;
+					default: {
+						ERR_PRINT("Animation corrupted (invalid track type)");
+						continue;
+					}
 				}
 
 				track_cache[path] = track;
@@ -853,6 +857,9 @@ void AnimationTree::_process_graph(float p_delta) {
 			for (int i = 0; i < a->get_track_count(); i++) {
 
 				NodePath path = a->track_get_path(i);
+
+				ERR_CONTINUE(!track_cache.has(path));
+
 				TrackCache *track = track_cache[path];
 				if (track->type != a->track_get_type(i)) {
 					continue; //may happen should not