seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix nested actions in EditorUndoRedoManager

Browse Source
This commit is contained in:
kobewi
2022-10-28 02:54:55 +02:00
parent 0486810697
commit d7ebf725c9
4 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
editor/animation_track_editor.cpp
View File

@ -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();