diff --git a/editor/docks/scene_tree_dock.cpp b/editor/docks/scene_tree_dock.cpp index c2713a1f5da..f0e362ffed6 100644 --- a/editor/docks/scene_tree_dock.cpp +++ b/editor/docks/scene_tree_dock.cpp @@ -907,6 +907,8 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) { } } + HashMap, Ref>> &resources_local_to_scenes = clipboard_resource_remap[edited_scene->get_scene_file_path()]; + for (Node *node : selection) { Node *parent = node->get_parent(); @@ -922,7 +924,7 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) { } HashMap duplimap; - Node *dup = node->duplicate_from_editor(duplimap); + Node *dup = node->duplicate_from_editor(duplimap, edited_scene, resources_local_to_scenes); ERR_CONTINUE(!dup); @@ -956,6 +958,14 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) { undo_redo->commit_action(); + for (KeyValue, Ref>> &KV : resources_local_to_scenes) { + for (KeyValue, Ref> &R : KV.value) { + if (R.value->is_local_to_scene()) { + R.value->setup_local_to_scene(); + } + } + } + if (dupsingle) { _push_item(dupsingle); } @@ -4334,26 +4344,25 @@ List SceneTreeDock::paste_nodes(bool p_paste_as_sibling) { } ur->add_do_method(editor_selection, "clear"); - HashMap, Ref> resource_remap; String target_scene; if (edited_scene) { target_scene = edited_scene->get_scene_file_path(); } + HashMap, Ref>> &resources_local_to_scenes = clipboard_resource_remap[target_scene]; // Record the mappings in the sub-scene. if (target_scene != clipboard_source_scene) { - if (!clipboard_resource_remap.has(target_scene)) { + if (!resources_local_to_scenes.has(nullptr)) { HashMap, Ref> remap; for (Node *E : node_clipboard) { _create_remap_for_node(E, remap); } - clipboard_resource_remap[target_scene] = remap; + resources_local_to_scenes[nullptr] = remap; } - resource_remap = clipboard_resource_remap[target_scene]; } for (Node *node : node_clipboard) { HashMap duplimap; - Node *dup = node->duplicate_from_editor(duplimap, resource_remap); + Node *dup = node->duplicate_from_editor(duplimap, edited_scene, resources_local_to_scenes); ERR_CONTINUE(!dup); pasted_nodes.push_back(dup); @@ -4396,6 +4405,15 @@ List SceneTreeDock::paste_nodes(bool p_paste_as_sibling) { } ur->commit_action(); + + for (KeyValue, Ref>> &KV : resources_local_to_scenes) { + for (KeyValue, Ref> &R : KV.value) { + if (R.value->is_local_to_scene()) { + R.value->setup_local_to_scene(); + } + } + } + return pasted_nodes; } diff --git a/editor/docks/scene_tree_dock.h b/editor/docks/scene_tree_dock.h index a73dd39ae12..9aa60a5c73a 100644 --- a/editor/docks/scene_tree_dock.h +++ b/editor/docks/scene_tree_dock.h @@ -146,7 +146,7 @@ class SceneTreeDock : public EditorDock { List node_clipboard; HashSet node_clipboard_edited_scene_owned; String clipboard_source_scene; - HashMap, Ref>> clipboard_resource_remap; + HashMap, Ref>>> clipboard_resource_remap; ScriptCreateDialog *script_create_dialog = nullptr; ShaderCreateDialog *shader_create_dialog = nullptr; diff --git a/scene/main/node.cpp b/scene/main/node.cpp index 15f33f31dac..668834abad2 100644 --- a/scene/main/node.cpp +++ b/scene/main/node.cpp @@ -2953,10 +2953,11 @@ Node *Node::duplicate(int p_flags) const { #ifdef TOOLS_ENABLED Node *Node::duplicate_from_editor(HashMap &r_duplimap) const { - return duplicate_from_editor(r_duplimap, HashMap, Ref>()); + HashMap, Ref>> tmp; + return duplicate_from_editor(r_duplimap, nullptr, tmp); } -Node *Node::duplicate_from_editor(HashMap &r_duplimap, const HashMap, Ref> &p_resource_remap) const { +Node *Node::duplicate_from_editor(HashMap &r_duplimap, Node *p_scene_root, HashMap, Ref>> &p_resource_remap) const { int flags = DUPLICATE_SIGNALS | DUPLICATE_GROUPS | DUPLICATE_SCRIPTS | DUPLICATE_USE_INSTANTIATION | DUPLICATE_FROM_EDITOR; Node *dupe = _duplicate(flags, &r_duplimap); @@ -2969,8 +2970,8 @@ Node *Node::duplicate_from_editor(HashMap &r_duplimap, con _duplicate_properties(this, this, dupe, flags); // This is used by SceneTreeDock's paste functionality. When pasting to foreign scene, resources are duplicated. - if (!p_resource_remap.is_empty()) { - remap_node_resources(dupe, p_resource_remap); + if (p_scene_root) { + remap_node_resources(dupe, p_scene_root, p_resource_remap); } // Duplication of signals must happen after all the node descendants have been copied, @@ -2981,7 +2982,9 @@ Node *Node::duplicate_from_editor(HashMap &r_duplimap, con return dupe; } -void Node::remap_node_resources(Node *p_node, const HashMap, Ref> &p_resource_remap) const { +void Node::remap_node_resources(Node *p_node, Node *p_scene_root, HashMap, Ref>> &p_resource_remap) const { + Node *local_scene = p_node->is_instance() ? p_node : (p_node->get_owner() ? p_node->get_owner() : p_scene_root); + List props; p_node->get_property_list(&props); @@ -2991,23 +2994,39 @@ void Node::remap_node_resources(Node *p_node, const HashMap, Refget(E.name); - if (v.is_ref_counted()) { - Ref res = v; - if (res.is_valid()) { - if (p_resource_remap.has(res)) { - p_node->set(E.name, p_resource_remap[res]); - remap_nested_resources(res, p_resource_remap); - } + if (!v.is_ref_counted()) { + continue; + } + Ref res = v; + if (res.is_null()) { + continue; + } + + if (res->is_local_to_scene()) { + if (local_scene == res->get_local_scene()) { + continue; + } + Ref dup = SceneState::get_remap_resource(res, p_resource_remap, nullptr, local_scene); + p_node->set(E.name, dup); + continue; + } + + if (res->is_built_in()) { + // Use nullptr instead of a specific node (current scene root node) to represent the scene, + // as the Make Scene Root operation may be executed. + if (p_resource_remap[nullptr].has(res)) { + p_node->set(E.name, p_resource_remap[nullptr][res]); + remap_nested_resources(res, p_resource_remap[nullptr]); } } } for (int i = 0; i < p_node->get_child_count(); i++) { - remap_node_resources(p_node->get_child(i), p_resource_remap); + remap_node_resources(p_node->get_child(i), p_scene_root, p_resource_remap); } } -void Node::remap_nested_resources(Ref p_resource, const HashMap, Ref> &p_resource_remap) const { +void Node::remap_nested_resources(Ref p_resource, HashMap, Ref> &p_resource_remap) const { List props; p_resource->get_property_list(&props); diff --git a/scene/main/node.h b/scene/main/node.h index a8c0b24c620..d0aaea2c855 100644 --- a/scene/main/node.h +++ b/scene/main/node.h @@ -721,9 +721,9 @@ public: Node *duplicate(int p_flags = DUPLICATE_GROUPS | DUPLICATE_SIGNALS | DUPLICATE_SCRIPTS) const; #ifdef TOOLS_ENABLED Node *duplicate_from_editor(HashMap &r_duplimap) const; - Node *duplicate_from_editor(HashMap &r_duplimap, const HashMap, Ref> &p_resource_remap) const; - void remap_node_resources(Node *p_node, const HashMap, Ref> &p_resource_remap) const; - void remap_nested_resources(Ref p_resource, const HashMap, Ref> &p_resource_remap) const; + Node *duplicate_from_editor(HashMap &r_duplimap, Node *p_scene_root, HashMap, Ref>> &p_resource_remap) const; + void remap_node_resources(Node *p_node, Node *p_scene_root, HashMap, Ref>> &p_resource_remap) const; + void remap_nested_resources(Ref p_resource, HashMap, Ref> &p_resource_remap) const; #endif // used by editors, to save what has changed only diff --git a/scene/resources/packed_scene.cpp b/scene/resources/packed_scene.cpp index 24df002bb88..05650a44d01 100644 --- a/scene/resources/packed_scene.cpp +++ b/scene/resources/packed_scene.cpp @@ -81,7 +81,13 @@ static Array _sanitize_node_pinned_properties(Node *p_node) { Ref SceneState::get_remap_resource(const Ref &p_resource, HashMap, Ref>> &remap_cache, const Ref &p_fallback, Node *p_for_scene) { ERR_FAIL_COND_V(p_resource.is_null(), Ref()); - bool reuse_fallback = p_fallback.is_valid() && p_fallback->is_local_to_scene() && p_fallback->get_class() == p_resource->get_class(); + // Find the shared copy of the source resource. + HashMap, Ref>::Iterator R = remap_cache[p_for_scene].find(p_resource); + if (R) { + return R->value; + } + + bool reuse_fallback = p_fallback.is_valid() && p_fallback->is_local_to_scene() && p_fallback->get_class_name() == p_resource->get_class_name(); if (reuse_fallback) { // The fallback resource can only be mapped at most once when it is valid. @@ -703,16 +709,16 @@ Variant SceneState::make_local_resource(Variant &p_value, const SceneState::Node Node *base = (p_i == 0 || p_node->is_instance()) ? p_node : (p_node->get_owner() ? p_node->get_owner() : p_ret_nodes[0]); + if (p_node_data.type == TYPE_INSTANTIATED) { // For the (root) nodes of sub-scenes, treat them as parts of the sub-scenes. + return get_remap_resource(res, p_resources_local_to_scenes, p_node->get(p_sname), base); + } + // Find the shared copy of the source resource. HashMap, Ref>::Iterator R = p_resources_local_to_scenes[base].find(res); if (R) { return R->value; } - if (p_node_data.type == TYPE_INSTANTIATED) { // For the (root) nodes of sub-scenes, treat them as parts of the sub-scenes. - return get_remap_resource(res, p_resources_local_to_scenes, p_node->get(p_sname), base); - } - if (p_edit_state == GEN_EDIT_STATE_MAIN) { // For the main scene, use the resource as is res->configure_for_local_scene(base, p_resources_local_to_scenes[base]); p_resources_local_to_scenes[base][res] = res;