Skip to content

Commit e0532a7

Browse files
RindbeeRindbee
committed
Fix resource shared when duplicating an instanced scene
For resources with `resource_local_to_scene` enabled in the sub-scene, the resource is already set when the sub-scene is instantiated, so does not need to be set again. Just needs to update the property of the resource according to the value in the main scene.
1 parent 1b4f116 commit e0532a7

File tree

5 files changed

+72
-29
lines changed

5 files changed

+72
-29
lines changed

‎editor/docks/scene_tree_dock.cpp‎

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -907,6 +907,8 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) {
907907
}
908908
}
909909

910+
HashMap<Node *, HashMap<Ref<Resource>, Ref<Resource>>> &resources_local_to_scenes = clipboard_resource_remap[edited_scene->get_scene_file_path()];
911+
910912
for (Node *node : selection) {
911913
Node *parent = node->get_parent();
912914

@@ -922,7 +924,7 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) {
922924
}
923925

924926
HashMap<const Node *, Node *> duplimap;
925-
Node *dup = node->duplicate_from_editor(duplimap);
927+
Node *dup = node->duplicate_from_editor(duplimap, edited_scene, resources_local_to_scenes);
926928

927929
ERR_CONTINUE(!dup);
928930

@@ -956,6 +958,14 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) {
956958

957959
undo_redo->commit_action();
958960

961+
for (KeyValue<Node *, HashMap<Ref<Resource>, Ref<Resource>>> &KV : resources_local_to_scenes) {
962+
for (KeyValue<Ref<Resource>, Ref<Resource>> &R : KV.value) {
963+
if (R.value->is_local_to_scene()) {
964+
R.value->setup_local_to_scene();
965+
}
966+
}
967+
}
968+
959969
if (dupsingle) {
960970
_push_item(dupsingle);
961971
}
@@ -4334,26 +4344,25 @@ List<Node *> SceneTreeDock::paste_nodes(bool p_paste_as_sibling) {
43344344
}
43354345
ur->add_do_method(editor_selection, "clear");
43364346

4337-
HashMap<Ref<Resource>, Ref<Resource>> resource_remap;
43384347
String target_scene;
43394348
if (edited_scene) {
43404349
target_scene = edited_scene->get_scene_file_path();
43414350
}
4351+
HashMap<Node *, HashMap<Ref<Resource>, Ref<Resource>>> &resources_local_to_scenes = clipboard_resource_remap[target_scene]; // Record the mappings in the sub-scene.
43424352
if (target_scene != clipboard_source_scene) {
4343-
if (!clipboard_resource_remap.has(target_scene)) {
4353+
if (!resources_local_to_scenes.has(nullptr)) {
43444354
HashMap<Ref<Resource>, Ref<Resource>> remap;
43454355
for (Node *E : node_clipboard) {
43464356
_create_remap_for_node(E, remap);
43474357
}
4348-
clipboard_resource_remap[target_scene] = remap;
4358+
resources_local_to_scenes[nullptr] = remap;
43494359
}
4350-
resource_remap = clipboard_resource_remap[target_scene];
43514360
}
43524361

43534362
for (Node *node : node_clipboard) {
43544363
HashMap<const Node *, Node *> duplimap;
43554364

4356-
Node *dup = node->duplicate_from_editor(duplimap, resource_remap);
4365+
Node *dup = node->duplicate_from_editor(duplimap, edited_scene, resources_local_to_scenes);
43574366
ERR_CONTINUE(!dup);
43584367

43594368
pasted_nodes.push_back(dup);
@@ -4396,6 +4405,15 @@ List<Node *> SceneTreeDock::paste_nodes(bool p_paste_as_sibling) {
43964405
}
43974406

43984407
ur->commit_action();
4408+
4409+
for (KeyValue<Node *, HashMap<Ref<Resource>, Ref<Resource>>> &KV : resources_local_to_scenes) {
4410+
for (KeyValue<Ref<Resource>, Ref<Resource>> &R : KV.value) {
4411+
if (R.value->is_local_to_scene()) {
4412+
R.value->setup_local_to_scene();
4413+
}
4414+
}
4415+
}
4416+
43994417
return pasted_nodes;
44004418
}
44014419

‎editor/docks/scene_tree_dock.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ class SceneTreeDock : public EditorDock {
146146
List<Node *> node_clipboard;
147147
HashSet<Node *> node_clipboard_edited_scene_owned;
148148
String clipboard_source_scene;
149-
HashMap<String, HashMap<Ref<Resource>, Ref<Resource>>> clipboard_resource_remap;
149+
HashMap<String, HashMap<Node *, HashMap<Ref<Resource>, Ref<Resource>>>> clipboard_resource_remap;
150150

151151
ScriptCreateDialog *script_create_dialog = nullptr;
152152
ShaderCreateDialog *shader_create_dialog = nullptr;

‎scene/main/node.cpp‎

Lines changed: 33 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2953,10 +2953,11 @@ Node *Node::duplicate(int p_flags) const {
29532953

29542954
#ifdef TOOLS_ENABLED
29552955
Node *Node::duplicate_from_editor(HashMap<const Node *, Node *> &r_duplimap) const {
2956-
return duplicate_from_editor(r_duplimap, HashMap<Ref<Resource>, Ref<Resource>>());
2956+
HashMap<Node *, HashMap<Ref<Resource>, Ref<Resource>>> tmp;
2957+
return duplicate_from_editor(r_duplimap, nullptr, tmp);
29572958
}
29582959

2959-
Node *Node::duplicate_from_editor(HashMap<const Node *, Node *> &r_duplimap, const HashMap<Ref<Resource>, Ref<Resource>> &p_resource_remap) const {
2960+
Node *Node::duplicate_from_editor(HashMap<const Node *, Node *> &r_duplimap, Node *p_scene_root, HashMap<Node *, HashMap<Ref<Resource>, Ref<Resource>>> &p_resource_remap) const {
29602961
int flags = DUPLICATE_SIGNALS | DUPLICATE_GROUPS | DUPLICATE_SCRIPTS | DUPLICATE_USE_INSTANTIATION | DUPLICATE_FROM_EDITOR;
29612962
Node *dupe = _duplicate(flags, &r_duplimap);
29622963

@@ -2969,8 +2970,8 @@ Node *Node::duplicate_from_editor(HashMap<const Node *, Node *> &r_duplimap, con
29692970
_duplicate_properties(this, this, dupe, flags);
29702971

29712972
// This is used by SceneTreeDock's paste functionality. When pasting to foreign scene, resources are duplicated.
2972-
if (!p_resource_remap.is_empty()) {
2973-
remap_node_resources(dupe, p_resource_remap);
2973+
if (p_scene_root) {
2974+
remap_node_resources(dupe, p_scene_root, p_resource_remap);
29742975
}
29752976

29762977
// Duplication of signals must happen after all the node descendants have been copied,
@@ -2981,7 +2982,9 @@ Node *Node::duplicate_from_editor(HashMap<const Node *, Node *> &r_duplimap, con
29812982
return dupe;
29822983
}
29832984

2984-
void Node::remap_node_resources(Node *p_node, const HashMap<Ref<Resource>, Ref<Resource>> &p_resource_remap) const {
2985+
void Node::remap_node_resources(Node *p_node, Node *p_scene_root, HashMap<Node *, HashMap<Ref<Resource>, Ref<Resource>>> &p_resource_remap) const {
2986+
Node *local_scene = p_node->is_instance() ? p_node : (p_node->get_owner() ? p_node->get_owner() : p_scene_root);
2987+
29852988
List<PropertyInfo> props;
29862989
p_node->get_property_list(&props);
29872990

@@ -2991,23 +2994,39 @@ void Node::remap_node_resources(Node *p_node, const HashMap<Ref<Resource>, Ref<R
29912994
}
29922995

29932996
Variant v = p_node->get(E.name);
2994-
if (v.is_ref_counted()) {
2995-
Ref<Resource> res = v;
2996-
if (res.is_valid()) {
2997-
if (p_resource_remap.has(res)) {
2998-
p_node->set(E.name, p_resource_remap[res]);
2999-
remap_nested_resources(res, p_resource_remap);
3000-
}
2997+
if (!v.is_ref_counted()) {
2998+
continue;
2999+
}
3000+
Ref<Resource> res = v;
3001+
if (res.is_null()) {
3002+
continue;
3003+
}
3004+
3005+
if (res->is_local_to_scene()) {
3006+
if (local_scene == res->get_local_scene()) {
3007+
continue;
3008+
}
3009+
Ref<Resource> dup = SceneState::get_remap_resource(res, p_resource_remap, nullptr, local_scene);
3010+
p_node->set(E.name, dup);
3011+
continue;
3012+
}
3013+
3014+
if (res->is_built_in()) {
3015+
// Use nullptr instead of a specific node (current scene root node) to represent the scene,
3016+
// as the Make Scene Root operation may be executed.
3017+
if (p_resource_remap[nullptr].has(res)) {
3018+
p_node->set(E.name, p_resource_remap[nullptr][res]);
3019+
remap_nested_resources(res, p_resource_remap[nullptr]);
30013020
}
30023021
}
30033022
}
30043023

30053024
for (int i = 0; i < p_node->get_child_count(); i++) {
3006-
remap_node_resources(p_node->get_child(i), p_resource_remap);
3025+
remap_node_resources(p_node->get_child(i), p_scene_root, p_resource_remap);
30073026
}
30083027
}
30093028

3010-
void Node::remap_nested_resources(Ref<Resource> p_resource, const HashMap<Ref<Resource>, Ref<Resource>> &p_resource_remap) const {
3029+
void Node::remap_nested_resources(Ref<Resource> p_resource, HashMap<Ref<Resource>, Ref<Resource>> &p_resource_remap) const {
30113030
List<PropertyInfo> props;
30123031
p_resource->get_property_list(&props);
30133032

‎scene/main/node.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -721,9 +721,9 @@ class Node : public Object {
721721
Node *duplicate(int p_flags = DUPLICATE_GROUPS | DUPLICATE_SIGNALS | DUPLICATE_SCRIPTS) const;
722722
#ifdef TOOLS_ENABLED
723723
Node *duplicate_from_editor(HashMap<const Node *, Node *> &r_duplimap) const;
724-
Node *duplicate_from_editor(HashMap<const Node *, Node *> &r_duplimap, const HashMap<Ref<Resource>, Ref<Resource>> &p_resource_remap) const;
725-
void remap_node_resources(Node *p_node, const HashMap<Ref<Resource>, Ref<Resource>> &p_resource_remap) const;
726-
void remap_nested_resources(Ref<Resource> p_resource, const HashMap<Ref<Resource>, Ref<Resource>> &p_resource_remap) const;
724+
Node *duplicate_from_editor(HashMap<const Node *, Node *> &r_duplimap, Node *p_scene_root, HashMap<Node *, HashMap<Ref<Resource>, Ref<Resource>>> &p_resource_remap) const;
725+
void remap_node_resources(Node *p_node, Node *p_scene_root, HashMap<Node *, HashMap<Ref<Resource>, Ref<Resource>>> &p_resource_remap) const;
726+
void remap_nested_resources(Ref<Resource> p_resource, HashMap<Ref<Resource>, Ref<Resource>> &p_resource_remap) const;
727727
#endif
728728

729729
// used by editors, to save what has changed only

‎scene/resources/packed_scene.cpp‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,13 @@ static Array _sanitize_node_pinned_properties(Node *p_node) {
8181
Ref<Resource> SceneState::get_remap_resource(const Ref<Resource> &p_resource, HashMap<Node *, HashMap<Ref<Resource>, Ref<Resource>>> &remap_cache, const Ref<Resource> &p_fallback, Node *p_for_scene) {
8282
ERR_FAIL_COND_V(p_resource.is_null(), Ref<Resource>());
8383

84-
bool reuse_fallback = p_fallback.is_valid() && p_fallback->is_local_to_scene() && p_fallback->get_class() == p_resource->get_class();
84+
// Find the shared copy of the source resource.
85+
HashMap<Ref<Resource>, Ref<Resource>>::Iterator R = remap_cache[p_for_scene].find(p_resource);
86+
if (R) {
87+
return R->value;
88+
}
89+
90+
bool reuse_fallback = p_fallback.is_valid() && p_fallback->is_local_to_scene() && p_fallback->get_class_name() == p_resource->get_class_name();
8591

8692
if (reuse_fallback) {
8793
// 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
703709

704710
Node *base = (p_i == 0 || p_node->is_instance()) ? p_node : (p_node->get_owner() ? p_node->get_owner() : p_ret_nodes[0]);
705711

712+
if (p_node_data.type == TYPE_INSTANTIATED) { // For the (root) nodes of sub-scenes, treat them as parts of the sub-scenes.
713+
return get_remap_resource(res, p_resources_local_to_scenes, p_node->get(p_sname), base);
714+
}
715+
706716
// Find the shared copy of the source resource.
707717
HashMap<Ref<Resource>, Ref<Resource>>::Iterator R = p_resources_local_to_scenes[base].find(res);
708718
if (R) {
709719
return R->value;
710720
}
711721

712-
if (p_node_data.type == TYPE_INSTANTIATED) { // For the (root) nodes of sub-scenes, treat them as parts of the sub-scenes.
713-
return get_remap_resource(res, p_resources_local_to_scenes, p_node->get(p_sname), base);
714-
}
715-
716722
if (p_edit_state == GEN_EDIT_STATE_MAIN) { // For the main scene, use the resource as is
717723
res->configure_for_local_scene(base, p_resources_local_to_scenes[base]);
718724
p_resources_local_to_scenes[base][res] = res;

0 commit comments

Comments
 (0)