godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-05 12:10:55 +00:00
Code Releases Wiki Activity

Fix resources wrongly duplicated upon instantiating inherited scenes

Browse Source
This commit is contained in:
Pedro J. Estébanez
2025-06-06 17:45:45 +02:00
parent 52ecb5ab9e
commit c854462ac5
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
scene/resources/packed_scene.cpp
View File

@@ -356,18 +356,18 @@ Node *SceneState::instantiate(GenEditState p_edit_state) const {
} else { } else {
Variant value = props[nprops[j].value]; Variant value = props[nprops[j].value];
// Making sure that instances of inherited scenes don't share the same
// reference between them.
if (is_inherited_scene) {
value = value.duplicate(true);
}
if (value.get_type() == Variant::OBJECT) { if (value.get_type() == Variant::OBJECT) {
//handle resources that are local to scene by duplicating them if needed //handle resources that are local to scene by duplicating them if needed
Ref<Resource> res = value; Ref<Resource> res = value;
if (res.is_valid()) { if (res.is_valid()) {
value = make_local_resource(value, n, resources_local_to_sub_scene, node, snames[nprops[j].name], resources_local_to_scene, i, ret_nodes, p_edit_state); value = make_local_resource(value, n, resources_local_to_sub_scene, node, snames[nprops[j].name], resources_local_to_scene, i, ret_nodes, p_edit_state);
} }
} else {
// Making sure that instances of inherited scenes don't share the same
// reference between them.
if (is_inherited_scene) {
value = value.duplicate(true);
}
} }
if (value.get_type() == Variant::ARRAY) { if (value.get_type() == Variant::ARRAY) {