From 612de1b6d295d6c91e133e71f115c7b65ce91087 Mon Sep 17 00:00:00 2001 From: kobewi Date: Tue, 30 Dec 2025 16:35:02 +0100 Subject: [PATCH] Remove unused parameter --- editor/docks/scene_tree_dock.cpp | 29 ++++------------------------- editor/docks/scene_tree_dock.h | 2 +- 2 files changed, 5 insertions(+), 26 deletions(-) diff --git a/editor/docks/scene_tree_dock.cpp b/editor/docks/scene_tree_dock.cpp index 722501a9b8..90af843213 100644 --- a/editor/docks/scene_tree_dock.cpp +++ b/editor/docks/scene_tree_dock.cpp @@ -3195,12 +3195,12 @@ void SceneTreeDock::replace_node(Node *p_node, Node *p_by_node) { EditorUndoRedoManager *ur = EditorUndoRedoManager::get_singleton(); ur->create_action(TTR("Change type of node(s)"), UndoRedo::MERGE_DISABLE, p_node); - ur->add_do_method(this, "replace_node", p_node, p_by_node, true, false); + ur->add_do_method(this, "replace_node", p_node, p_by_node, true); ur->add_do_reference(p_by_node); - _replace_node(p_node, p_by_node, true, false); + _replace_node(p_node, p_by_node, true); - ur->add_undo_method(this, "replace_node", p_by_node, p_node, false, false); + ur->add_undo_method(this, "replace_node", p_by_node, p_node, false); ur->add_undo_reference(p_node); perform_node_replace(nullptr, p_node, p_by_node); @@ -3208,7 +3208,7 @@ void SceneTreeDock::replace_node(Node *p_node, Node *p_by_node) { ur->commit_action(false); } -void SceneTreeDock::_replace_node(Node *p_node, Node *p_by_node, bool p_keep_properties, bool p_remove_old) { +void SceneTreeDock::_replace_node(Node *p_node, Node *p_by_node, bool p_keep_properties) { ERR_FAIL_COND_MSG(!p_node->is_inside_tree(), "_replace_node() can't be called on a node outside of tree. You might have called it twice."); Node *oldnode = p_node; Node *newnode = p_by_node; @@ -3282,14 +3282,6 @@ void SceneTreeDock::_replace_node(Node *p_node, Node *p_by_node, bool p_keep_pro } String newname = oldnode->get_name(); - - List to_erase; - for (int i = 0; i < oldnode->get_child_count(); i++) { - if (oldnode->get_child(i)->get_owner() == nullptr && oldnode->is_internal()) { - to_erase.push_back(oldnode->get_child(i)); - } - } - if (oldnode == edited_scene) { EditorNode::get_singleton()->set_edited_scene_root(newnode, false); } @@ -3306,22 +3298,9 @@ void SceneTreeDock::_replace_node(Node *p_node, Node *p_by_node, bool p_keep_pro Node *c = newnode->get_child(i); c->call("set_transform", c->call("get_transform")); } - //p_remove_old was added to support undo - if (p_remove_old) { - EditorUndoRedoManager::get_singleton()->clear_history(); - } newnode->set_name(newname); _push_item(newnode); - - if (p_remove_old) { - memdelete(oldnode); - - while (to_erase.front()) { - memdelete(to_erase.front()->get()); - to_erase.pop_front(); - } - } } void SceneTreeDock::perform_node_replace(Node *p_base, Node *p_node, Node *p_by_node) { diff --git a/editor/docks/scene_tree_dock.h b/editor/docks/scene_tree_dock.h index 983b24e16b..894aa135cc 100644 --- a/editor/docks/scene_tree_dock.h +++ b/editor/docks/scene_tree_dock.h @@ -304,7 +304,7 @@ class SceneTreeDock : public EditorDock { void _check_object_properties_recursive(Node *p_root_node, Object *p_obj, HashMap *p_renames, bool p_inside_resource = false) const; bool _check_node_path_recursive(Node *p_root_node, Variant &r_variant, HashMap *p_renames, bool p_inside_resource = false) const; bool _check_node_recursive(Variant &r_variant, Node *p_node, Node *p_by_node, const String type_hint, String &r_warn_message); - void _replace_node(Node *p_node, Node *p_by_node, bool p_keep_properties = true, bool p_remove_old = true); + void _replace_node(Node *p_node, Node *p_by_node, bool p_keep_properties = true); private: static SceneTreeDock *singleton;