diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2023-04-25 09:58:41 +0200 |
---|---|---|
committer | Rémi Verschelde <rverschelde@gmail.com> | 2023-04-25 09:58:41 +0200 |
commit | ed62d965eb573f69c131df73ee875ac18b04ca16 (patch) | |
tree | 5a5ca3cc05eb50efdcf4befb67f9571cba611ac3 | |
parent | 15d952147c5eb3e62eb1d046971b8c9f3d84713d (diff) | |
parent | 6c6c1302f388c1a0edfd685a3d7c079461bac79d (diff) | |
download | redot-engine-ed62d965eb573f69c131df73ee875ac18b04ca16.tar.gz |
Merge pull request #75429 from MewPurPur/Literally-cant-have-a-functioning-level-editor-because-of-this-please-helppp
Fix PackedScenes created with PackedScene.pack() have their exported nodes become null
-rw-r--r-- | scene/resources/packed_scene.cpp | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/scene/resources/packed_scene.cpp b/scene/resources/packed_scene.cpp index a1e7558653..1cb7c9e574 100644 --- a/scene/resources/packed_scene.cpp +++ b/scene/resources/packed_scene.cpp @@ -263,17 +263,16 @@ Node *SceneState::instantiate(GenEditState p_edit_state) const { } } else { - if (Engine::get_singleton()->is_editor_hint()) { - // If editor, just set the metadata and be it. - node->set(PackedScene::META_POINTER_PROPERTY_BASE + String(prop_name), prop_variant); - continue; + node->set(PackedScene::META_POINTER_PROPERTY_BASE + String(prop_name), prop_variant); + + if (!Engine::get_singleton()->is_editor_hint()) { + // If not editor, do an actual deferred sed of the property path. + DeferredNodePathProperties dnp; + dnp.path = prop_variant; + dnp.base = node; + dnp.property = prop_name; + deferred_node_paths.push_back(dnp); } - // Do an actual deferred sed of the property path. - DeferredNodePathProperties dnp; - dnp.path = prop_variant; - dnp.base = node; - dnp.property = prop_name; - deferred_node_paths.push_back(dnp); } continue; } |