Przeglądaj źródła

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
Rémi Verschelde 2 lat temu
rodzic
commit
ed62d965eb
1 zmienionych plików z 9 dodań i 10 usunięć
  1. 9 10
      scene/resources/packed_scene.cpp

+ 9 - 10
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;
 					}