From 1ecf20c7838a873fd25cb9e49b2455b429747a3a Mon Sep 17 00:00:00 2001 From: Mikael Hermansson Date: Wed, 14 Aug 2024 11:58:27 +0200 Subject: [PATCH] Fix errors about `UndoRedo` history mismatch when deleting bezier track (cherry picked from commit 4db3e6e6cd08a0121cdb3b93d5638a667b6665a3) --- editor/animation_bezier_editor.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/editor/animation_bezier_editor.cpp b/editor/animation_bezier_editor.cpp index 48b9e01fd83..f74bdd8bb9f 100644 --- a/editor/animation_bezier_editor.cpp +++ b/editor/animation_bezier_editor.cpp @@ -1083,7 +1083,7 @@ void AnimationBezierTrackEdit::gui_input(const Ref &p_event) { if (I.key == REMOVE_ICON) { if (!read_only) { EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton(); - undo_redo->create_action("Remove Bezier Track"); + undo_redo->create_action("Remove Bezier Track", UndoRedo::MERGE_DISABLE, animation.ptr()); undo_redo->add_do_method(this, "_update_locked_tracks_after", track); undo_redo->add_do_method(this, "_update_hidden_tracks_after", track);