diff options
author | Pedro J. Estébanez <pedrojrulez@gmail.com> | 2021-11-17 14:00:23 +0100 |
---|---|---|
committer | Pedro J. Estébanez <pedrojrulez@gmail.com> | 2021-11-17 14:00:23 +0100 |
commit | 78ffc2a987ed672c7fd9d2fa9f3e74ee047f917f (patch) | |
tree | 2139f766d40680afeb53cddff08dd96455096204 /scene/resources | |
parent | eb98fd94421b124a5848d7ee6c7ead4337222c6c (diff) |
Fix crash when loading scene instance after node vanished from parent
Diffstat (limited to 'scene/resources')
-rw-r--r-- | scene/resources/packed_scene.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/scene/resources/packed_scene.cpp b/scene/resources/packed_scene.cpp index f43715a463..3f4765d20f 100644 --- a/scene/resources/packed_scene.cpp +++ b/scene/resources/packed_scene.cpp @@ -315,13 +315,13 @@ Node *SceneState::instantiate(GenEditState p_edit_state) const { node->_set_owner_nocheck(owner); } } - } - // we only want to deal with pinned flag if instancing as pure main (no instance, no inheriting) - if (p_edit_state == GEN_EDIT_STATE_MAIN) { - _sanitize_node_pinned_properties(node); - } else { - node->remove_meta("_edit_pinned_properties_"); + // we only want to deal with pinned flag if instancing as pure main (no instance, no inheriting) + if (p_edit_state == GEN_EDIT_STATE_MAIN) { + _sanitize_node_pinned_properties(node); + } else { + node->remove_meta("_edit_pinned_properties_"); + } } ret_nodes[i] = node; |