Revert "Added toggle for loop interpolation based on adolson's code"

This reverts commits 8884b8f51963553dd1ecc0bc4accf64deb4f645f
bd5c8f2aa086c2cacc704dfef249c124760ab569
and 5cb31f6d5b667a551092b699de6f4786e0bb5b6d.

<reduz> Akien, I understand the need for the second loop mode, but I think
the current UI is pretty confusing. I think this should be changed for an
enum, both there and in the animation.. otherwise we should revert it
[...]
<reduz> alternatively this could be added per track, which I think should
make it a little less confusing

Reopens #959..

3 files changed, 0 insertions, 26 deletions

diff --git a/tools/editor/animation_editor.cpp b/tools/editor/animation_editor.cpp
index dd3c3fee32..7582162b72 100644
--- a/tools/editor/animation_editor.cpp
+++ b/tools/editor/animation_editor.cpp
@@ -2922,7 +2922,6 @@ void AnimationKeyEditor::_notification(int p_what) {
 				edit_button->connect("pressed",this,"_toggle_edit_curves");
 
 				loop->set_icon(get_icon("Loop","EditorIcons"));
-				loop_interpolation->set_icon(get_icon("LoopInterpolation","EditorIcons"));
 				curve_edit->connect("transition_changed",this,"_curve_transition_changed");
 
 				//edit_button->add_color_override("font_color",get_color("font_color","Tree"));
@@ -3013,7 +3012,6 @@ void AnimationKeyEditor::_update_menu() {
 
 		length->set_val(animation->get_length());
 		loop->set_pressed(animation->has_loop());
-		loop_interpolation->set_pressed(animation->has_loop_interpolation());
 		step->set_val(animation->get_step());
 	}
 
@@ -3469,21 +3467,6 @@ void AnimationKeyEditor::_animation_loop_changed() {
 
 }
 
-void AnimationKeyEditor::_animation_loop_interpolation_changed() {
-
-	if (updating)
-		return;
-
-	if (!animation.is_null()) {
-
-		undo_redo->create_action(TTR("Change Anim Loop Interpolation"));
-		undo_redo->add_do_method(animation.ptr(),"set_loop_interpolation",loop_interpolation->is_pressed());
-		undo_redo->add_undo_method(animation.ptr(),"set_loop_interpolation",!loop_interpolation->is_pressed());
-		undo_redo->commit_action();
-	}
-
-}
-
 
 void AnimationKeyEditor::_create_value_item(int p_type) {
 
@@ -3769,7 +3752,6 @@ void AnimationKeyEditor::_bind_methods() {
 
 
 	ObjectTypeDB::bind_method(_MD("_animation_loop_changed"),&AnimationKeyEditor::_animation_loop_changed);
-	ObjectTypeDB::bind_method(_MD("_animation_loop_interpolation_changed"),&AnimationKeyEditor::_animation_loop_interpolation_changed);
 	ObjectTypeDB::bind_method(_MD("_animation_len_changed"),&AnimationKeyEditor::_animation_len_changed);
 	ObjectTypeDB::bind_method(_MD("_create_value_item"),&AnimationKeyEditor::_create_value_item);
 	ObjectTypeDB::bind_method(_MD("_pane_drag"),&AnimationKeyEditor::_pane_drag);
@@ -3880,12 +3862,6 @@ AnimationKeyEditor::AnimationKeyEditor() {
 	hb->add_child(loop);
 	loop->set_tooltip(TTR("Enable/Disable looping in animation."));
 
-	loop_interpolation = memnew( ToolButton );
-	loop_interpolation->set_toggle_mode(true);
-	loop_interpolation->connect("pressed",this,"_animation_loop_interpolation_changed");
-	hb->add_child(loop_interpolation);
-	loop_interpolation->set_tooltip(TTR("Enable/Disable interpolation when looping animation."));
-
 	hb->add_child( memnew( VSeparator ) );
 
 	menu_add_track = memnew( MenuButton );
diff --git a/tools/editor/animation_editor.h b/tools/editor/animation_editor.h
index c8de1d87c1..413c73b4b9 100644
--- a/tools/editor/animation_editor.h
+++ b/tools/editor/animation_editor.h
@@ -173,7 +173,6 @@ class AnimationKeyEditor : public VBoxContainer  {
 	//MenuButton *menu;
 	SpinBox *length;
 	Button *loop;
-	Button *loop_interpolation;
 	bool keying;
 	ToolButton *edit_button;
 	ToolButton *move_up_button;
@@ -239,7 +238,6 @@ class AnimationKeyEditor : public VBoxContainer  {
 
 	void _animation_len_changed(float p_len);
 	void _animation_loop_changed();
-	void _animation_loop_interpolation_changed();
 	void _step_changed(float p_len);
 
 	struct InsertData {
diff --git a/tools/editor/icons/icon_loop_interpolation.png b/tools/editor/icons/icon_loop_interpolation.png
deleted file mode 100644
index 488b33316e..0000000000
--- a/tools/editor/icons/icon_loop_interpolation.png
+++ /dev/null