diff options
| author | kobewi <kobewi4e@gmail.com> | 2022-10-28 02:54:55 +0200 |
|---|---|---|
| committer | kobewi <kobewi4e@gmail.com> | 2022-10-28 02:54:55 +0200 |
| commit | d7ebf725c9d83b6694802d18c36bab42b11759c7 (patch) | |
| tree | bb198f368c73e03bd4d6660fbc9f4c2e32cb7846 /editor/animation_track_editor.cpp | |
| parent | 0486810697f8c22b190dd18e8d72ac18ef0664c3 (diff) | |
| download | redot-engine-d7ebf725c9d83b6694802d18c36bab42b11759c7.tar.gz | |
Fix nested actions in EditorUndoRedoManager
Diffstat (limited to 'editor/animation_track_editor.cpp')
| -rw-r--r-- | editor/animation_track_editor.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/editor/animation_track_editor.cpp b/editor/animation_track_editor.cpp index 8a2d23d32d..943cbc86e3 100644 --- a/editor/animation_track_editor.cpp +++ b/editor/animation_track_editor.cpp @@ -3613,7 +3613,7 @@ void AnimationTrackEditor::_animation_track_remove_request(int p_track, Ref<Anim } int idx = p_track; if (idx >= 0 && idx < p_from_animation->get_track_count()) { - undo_redo->create_action(TTR("Remove Anim Track")); + undo_redo->create_action(TTR("Remove Anim Track"), UndoRedo::MERGE_DISABLE, p_from_animation.ptr()); // Remove corresponding reset tracks if they are no longer needed. AnimationPlayer *player = AnimationPlayerEditor::get_singleton()->get_player(); |