diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2022-11-14 18:29:46 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2022-11-14 18:29:46 +0100 |
| commit | beed90ea6d4a3e779a115622776206cc6b052a6c (patch) | |
| tree | 1d374a943ab621e2cdcb4059ff72cad4c2339f48 /editor/animation_track_editor.cpp | |
| parent | 4d9adfea23f193d51f8a53371d311a9595320655 (diff) | |
| parent | d7ebf725c9d83b6694802d18c36bab42b11759c7 (diff) | |
| download | redot-engine-beed90ea6d4a3e779a115622776206cc6b052a6c.tar.gz | |
Merge pull request #67963 from KoBeWi/den_of_actions
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 44ecda103e..0c8176a44b 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(); |