2 files changed, 19 insertions, 1 deletions

diff --git a/scene/resources/animation.cpp b/scene/resources/animation.cpp
index f7d5ddc744..c8525b29b6 100644
--- a/scene/resources/animation.cpp
+++ b/scene/resources/animation.cpp
@@ -38,6 +38,8 @@ bool Animation::_set(const StringName& p_name, const Variant& p_value) {
 		set_length(p_value);
 	else if (name=="loop")
 		set_loop(p_value);
+	else if (name=="loop_interpolation")
+		set_loop_interpolation(p_value);
 	else if (name=="step")
 		set_step(p_value);
 	else if (name.begins_with("tracks/")) {
@@ -1221,7 +1223,7 @@ T Animation::_interpolate( const Vector< TKey<T> >& p_keys, float p_time,  Inter
 	float c=0;
 	// prepare for all cases of interpolation
 
-	if (loop) {
+	if (loop and loop_interpolation) {
 	// loop
 		if (idx>=0) {
 
@@ -1607,10 +1609,19 @@ void Animation::set_loop(bool p_enabled) {
 	loop=p_enabled;
 	emit_changed();
 }
+void Animation::set_loop_interpolation(bool p_enabled) {
+
+	loop_interpolation=p_enabled;
+	emit_changed();
+}
 bool Animation::has_loop() const {
 
 	return loop;
 }
+bool Animation::has_loop_interpolation() const {
+	
+	return loop_interpolation;
+}
 
 void Animation::track_move_up(int p_track) {
 
@@ -1689,7 +1700,9 @@ void Animation::_bind_methods() {
 	ObjectTypeDB::bind_method(_MD("get_length"),&Animation::get_length);
 
 	ObjectTypeDB::bind_method(_MD("set_loop","enabled"),&Animation::set_loop);
+	ObjectTypeDB::bind_method(_MD("set_loop_interpolation","enabled"),&Animation::set_loop_interpolation);
 	ObjectTypeDB::bind_method(_MD("has_loop"),&Animation::has_loop);
+	ObjectTypeDB::bind_method(_MD("has_loop_interpolation"),&Animation::has_loop_interpolation);
 
 	ObjectTypeDB::bind_method(_MD("set_step","size_sec"),&Animation::set_step);
 	ObjectTypeDB::bind_method(_MD("get_step"),&Animation::get_step);
@@ -1712,6 +1725,7 @@ void Animation::clear() {
 		memdelete( tracks[i] );
 	tracks.clear();
 	loop=false;
+	loop_interpolation=true;
 	length=1;
 
 }
@@ -1971,6 +1985,7 @@ Animation::Animation() {
 
 	step=0.1;
 	loop=false;
+	loop_interpolation=true;
 	length=1;
 }
 
diff --git a/scene/resources/animation.h b/scene/resources/animation.h
index 1f2d9b80ab..e1d76d1ffd 100644
--- a/scene/resources/animation.h
+++ b/scene/resources/animation.h
@@ -163,6 +163,7 @@ private:
 	float length;
 	float step;
 	bool loop;
+	bool loop_interpolation;
 
 // bind helpers
 private:
@@ -265,7 +266,9 @@ public:
 	float get_length() const;
 
 	void set_loop(bool p_enabled);
+	void set_loop_interpolation(bool p_enabled);
 	bool has_loop() const;
+	bool has_loop_interpolation() const;
 
 	void set_step(float p_step);
 	float get_step() const;