seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prevent crash at loading some scenes

Browse Source
This commit is contained in:
Yuri Rubinsky
2022-08-28 21:56:04 +03:00
parent 006915b482
commit a33903d23f
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
scene/resources/packed_scene.cpp
View File

@ -288,9 +288,11 @@ Node *SceneState::instantiate(GenEditState p_edit_state) const {
// then tell this node to reference that resource. // then tell this node to reference that resource.
if (n.instance >= 0) { if (n.instance >= 0) {
Ref<Resource> node_res = node->get(snames[nprops[j].name]); Ref<Resource> node_res = node->get(snames[nprops[j].name]);
node_res->copy_from(res); if (node_res.is_valid()) {
node_res->configure_for_local_scene(node, resources_local_to_scene); node_res->copy_from(res);
value = node_res; node_res->configure_for_local_scene(node, resources_local_to_scene);
value = node_res;
}
} else { } else {
HashMap<Ref<Resource>, Ref<Resource>>::Iterator E = resources_local_to_scene.find(res); HashMap<Ref<Resource>, Ref<Resource>>::Iterator E = resources_local_to_scene.find(res);
Node *base = i == 0 ? node : ret_nodes[0]; Node *base = i == 0 ? node : ret_nodes[0];