From 0f7b4e4252c3d63cdc2d1ee42bbdee5307ec7497 Mon Sep 17 00:00:00 2001 From: emild Date: Thu, 15 Feb 2024 01:31:07 +0100 Subject: Fix bezier editor handle mode undo history mismatch --- editor/animation_bezier_editor.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'editor/animation_bezier_editor.cpp') diff --git a/editor/animation_bezier_editor.cpp b/editor/animation_bezier_editor.cpp index 34ca653ff7..dbe581028b 100644 --- a/editor/animation_bezier_editor.cpp +++ b/editor/animation_bezier_editor.cpp @@ -794,7 +794,7 @@ void AnimationBezierTrackEdit::_clear_selection() { void AnimationBezierTrackEdit::_change_selected_keys_handle_mode(Animation::HandleMode p_mode, bool p_auto) { EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton(); - undo_redo->create_action(TTR("Update Selected Key Handles")); + undo_redo->create_action(TTR("Update Selected Key Handles"), UndoRedo::MERGE_DISABLE, animation.ptr()); for (SelectionSet::Element *E = selection.back(); E; E = E->prev()) { const IntPair track_key_pair = E->get(); undo_redo->add_undo_method(editor, "_bezier_track_set_key_handle_mode", animation.ptr(), track_key_pair.first, track_key_pair.second, animation->bezier_track_get_key_handle_mode(track_key_pair.first, track_key_pair.second), Animation::HANDLE_SET_MODE_NONE); -- cgit v1.2.3