diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-01-31 18:13:32 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-31 18:13:32 +0100 |
| commit | 7d97f04da837f833e12ff4e7356663abd17f0a3e (patch) | |
| tree | c61aac706ef3ddba15b633ad2820c33d96e13062 /editor | |
| parent | 243fbebb895713cb846e19538969112d3695eded (diff) | |
| parent | c9cce53983fcf5f00d780d1ec08d0f82f34bf49e (diff) | |
Merge pull request #57454 from rcorre/undo_skel
Diffstat (limited to 'editor')
| -rw-r--r-- | editor/plugins/skeleton_3d_editor_plugin.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/editor/plugins/skeleton_3d_editor_plugin.cpp b/editor/plugins/skeleton_3d_editor_plugin.cpp index 169ce29438..5dd24983ff 100644 --- a/editor/plugins/skeleton_3d_editor_plugin.cpp +++ b/editor/plugins/skeleton_3d_editor_plugin.cpp @@ -383,7 +383,7 @@ void Skeleton3DEditor::create_physical_skeleton() { if (!bones_infos[parent].physical_bone) { bones_infos.write[parent].physical_bone = create_physical_bone(parent, bone_id, bones_infos); - ur->create_action(TTR("Create physical bones")); + ur->create_action(TTR("Create physical bones"), UndoRedo::MERGE_ALL); ur->add_do_method(skeleton, "add_child", bones_infos[parent].physical_bone); ur->add_do_reference(bones_infos[parent].physical_bone); ur->add_undo_method(skeleton, "remove_child", bones_infos[parent].physical_bone); |