1 files changed, 15 insertions, 44 deletions

diff --git a/editor/animation_track_editor.cpp b/editor/animation_track_editor.cpp
index b8d5b64d3f..14ca35a664 100644
--- a/editor/animation_track_editor.cpp
+++ b/editor/animation_track_editor.cpp
@@ -1323,20 +1323,8 @@ void AnimationTimelineEdit::_anim_length_changed(double p_new_len) {
 
 void AnimationTimelineEdit::_anim_loop_pressed() {
 	undo_redo->create_action(TTR("Change Animation Loop"));
-	switch (animation->get_loop_mode()) {
-		case Animation::LoopMode::LOOP_NONE: {
-			undo_redo->add_do_method(animation.ptr(), "set_loop_mode", Animation::LoopMode::LOOP_LINEAR);
-		} break;
-		case Animation::LoopMode::LOOP_LINEAR: {
-			undo_redo->add_do_method(animation.ptr(), "set_loop_mode", Animation::LoopMode::LOOP_PINGPONG);
-		} break;
-		case Animation::LoopMode::LOOP_PINGPONG: {
-			undo_redo->add_do_method(animation.ptr(), "set_loop_mode", Animation::LoopMode::LOOP_NONE);
-		} break;
-		default:
-			break;
-	}
-	undo_redo->add_undo_method(animation.ptr(), "set_loop_mode", animation->get_loop_mode());
+	undo_redo->add_do_method(animation.ptr(), "set_loop", loop->is_pressed());
+	undo_redo->add_undo_method(animation.ptr(), "set_loop", animation->has_loop());
 	undo_redo->commit_action();
 }
 
@@ -1619,24 +1607,7 @@ void AnimationTimelineEdit::update_values() {
 		length->set_tooltip(TTR("Animation length (seconds)"));
 		time_icon->set_tooltip(TTR("Animation length (seconds)"));
 	}
-
-	switch (animation->get_loop_mode()) {
-		case Animation::LoopMode::LOOP_NONE: {
-			loop->set_icon(get_theme_icon("Loop", "EditorIcons"));
-			loop->set_pressed(false);
-		} break;
-		case Animation::LoopMode::LOOP_LINEAR: {
-			loop->set_icon(get_theme_icon("Loop", "EditorIcons"));
-			loop->set_pressed(true);
-		} break;
-		case Animation::LoopMode::LOOP_PINGPONG: {
-			loop->set_icon(get_theme_icon("PingPongLoop", "EditorIcons"));
-			loop->set_pressed(true);
-		} break;
-		default:
-			break;
-	}
-
+	loop->set_pressed(animation->has_loop());
 	editing = false;
 }
 
@@ -2079,25 +2050,25 @@ void AnimationTrackEdit::_notification(int p_what) {
 
 				Ref<Texture2D> icon = wrap_icon[loop_wrap ? 1 : 0];
 
-				loop_wrap_rect.position.x = ofs;
-				loop_wrap_rect.position.y = int(get_size().height - icon->get_height()) / 2;
-				loop_wrap_rect.size = icon->get_size();
+				loop_mode_rect.position.x = ofs;
+				loop_mode_rect.position.y = int(get_size().height - icon->get_height()) / 2;
+				loop_mode_rect.size = icon->get_size();
 
 				if (animation->track_get_type(track) == Animation::TYPE_VALUE || animation->track_get_type(track) == Animation::TYPE_TRANSFORM3D) {
-					draw_texture(icon, loop_wrap_rect.position);
+					draw_texture(icon, loop_mode_rect.position);
 				}
 
-				loop_wrap_rect.position.y = 0;
-				loop_wrap_rect.size.y = get_size().height;
+				loop_mode_rect.position.y = 0;
+				loop_mode_rect.size.y = get_size().height;
 
 				ofs += icon->get_width() + hsep;
-				loop_wrap_rect.size.x += hsep;
+				loop_mode_rect.size.x += hsep;
 
 				if (animation->track_get_type(track) == Animation::TYPE_VALUE || animation->track_get_type(track) == Animation::TYPE_TRANSFORM3D) {
 					draw_texture(down_icon, Vector2(ofs, int(get_size().height - down_icon->get_height()) / 2));
-					loop_wrap_rect.size.x += down_icon->get_width();
+					loop_mode_rect.size.x += down_icon->get_width();
 				} else {
-					loop_wrap_rect = Rect2();
+					loop_mode_rect = Rect2();
 				}
 
 				ofs += down_icon->get_width();
@@ -2444,7 +2415,7 @@ String AnimationTrackEdit::get_tooltip(const Point2 &p_pos) const {
 		return TTR("Interpolation Mode");
 	}
 
-	if (loop_wrap_rect.has_point(p_pos)) {
+	if (loop_mode_rect.has_point(p_pos)) {
 		return TTR("Loop Wrap Mode (Interpolate end with beginning on loop)");
 	}
 
@@ -2643,7 +2614,7 @@ void AnimationTrackEdit::gui_input(const Ref<InputEvent> &p_event) {
 			accept_event();
 		}
 
-		if (loop_wrap_rect.has_point(pos)) {
+		if (loop_mode_rect.has_point(pos)) {
 			if (!menu) {
 				menu = memnew(PopupMenu);
 				add_child(menu);
@@ -2654,7 +2625,7 @@ void AnimationTrackEdit::gui_input(const Ref<InputEvent> &p_event) {
 			menu->add_icon_item(get_theme_icon(SNAME("InterpWrapLoop"), SNAME("EditorIcons")), TTR("Wrap Loop Interp"), MENU_LOOP_WRAP);
 			menu->set_as_minsize();
 
-			Vector2 popup_pos = get_screen_position() + loop_wrap_rect.position + Vector2(0, loop_wrap_rect.size.height);
+			Vector2 popup_pos = get_screen_position() + loop_mode_rect.position + Vector2(0, loop_mode_rect.size.height);
 			menu->set_position(popup_pos);
 			menu->popup();
 			accept_event();