diff options
| author | Max Hilbrunner <mhilbrunner@users.noreply.github.com> | 2021-08-28 22:14:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-28 22:14:35 +0200 |
| commit | 00e66e26ccb89fca19a59a8636fbceb31fc0d4d3 (patch) | |
| tree | b5e54acf810450b2058b7f343bff1f0609cb8d18 | |
| parent | 04c64b59a12a0ea9a2dfa153c630693c7391827d (diff) | |
| parent | fab88a810ccd32ed5a573050171d12c73f69a668 (diff) | |
Merge pull request #49664 from nekomatata/fix-editable-duplicated
Fix loading packed scene with editable children at runtime
| -rw-r--r-- | scene/resources/packed_scene.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/scene/resources/packed_scene.cpp b/scene/resources/packed_scene.cpp index 54bfc427c4..e74f759855 100644 --- a/scene/resources/packed_scene.cpp +++ b/scene/resources/packed_scene.cpp @@ -379,10 +379,17 @@ Error SceneState::_parse_node(Node *p_owner, Node *p_node, int p_parent_idx, Map return OK; } + bool is_editable_instance = false; + // save the child instantiated scenes that are chosen as editable, so they can be restored // upon load back if (p_node != p_owner && p_node->get_filename() != String() && p_owner->is_editable_instance(p_node)) { editable_instances.push_back(p_owner->get_path_to(p_node)); + // Node is the root of an editable instance. + is_editable_instance = true; + } else if (p_node->get_owner() && p_node->get_owner() != p_owner && p_owner->is_editable_instance(p_node->get_owner())) { + // Node is part of an editable instance. + is_editable_instance = true; } NodeData nd; @@ -610,7 +617,7 @@ Error SceneState::_parse_node(Node *p_owner, Node *p_node, int p_parent_idx, Map // Save the right type. If this node was created by an instance // then flag that the node should not be created but reused - if (pack_state_stack.is_empty()) { + if (pack_state_stack.is_empty() && !is_editable_instance) { //this node is not part of an instancing process, so save the type nd.type = _nm_get_string(p_node->get_class(), name_map); } else { |