From ea04fc7cdecc926cd33dd54c62d7a9e50708070a Mon Sep 17 00:00:00 2001 From: kobewi Date: Thu, 9 May 2024 22:12:55 +0200 Subject: [PATCH] Fix Sprite2D editor history mismatch --- editor/plugins/sprite_2d_editor_plugin.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/editor/plugins/sprite_2d_editor_plugin.cpp b/editor/plugins/sprite_2d_editor_plugin.cpp index 34a0df59066..557594b2a99 100644 --- a/editor/plugins/sprite_2d_editor_plugin.cpp +++ b/editor/plugins/sprite_2d_editor_plugin.cpp @@ -396,7 +396,7 @@ void Sprite2DEditor::_create_collision_polygon_2d_node() { collision_polygon_2d_instance->set_polygon(outline); EditorUndoRedoManager *ur = EditorUndoRedoManager::get_singleton(); - ur->create_action(TTR("Create CollisionPolygon2D Sibling")); + ur->create_action(TTR("Create CollisionPolygon2D Sibling"), UndoRedo::MERGE_DISABLE, node); ur->add_do_method(this, "_add_as_sibling_or_child", node, collision_polygon_2d_instance); ur->add_do_reference(collision_polygon_2d_instance); ur->add_undo_method(node != get_tree()->get_edited_scene_root() ? node->get_parent() : get_tree()->get_edited_scene_root(), "remove_child", collision_polygon_2d_instance); @@ -429,7 +429,7 @@ void Sprite2DEditor::_create_light_occluder_2d_node() { light_occluder_2d_instance->set_occluder_polygon(polygon); EditorUndoRedoManager *ur = EditorUndoRedoManager::get_singleton(); - ur->create_action(TTR("Create LightOccluder2D Sibling")); + ur->create_action(TTR("Create LightOccluder2D Sibling"), UndoRedo::MERGE_DISABLE, node); ur->add_do_method(this, "_add_as_sibling_or_child", node, light_occluder_2d_instance); ur->add_do_reference(light_occluder_2d_instance); ur->add_undo_method(node != get_tree()->get_edited_scene_root() ? node->get_parent() : get_tree()->get_edited_scene_root(), "remove_child", light_occluder_2d_instance);