Fix typed array export

Apply suggestions from code review to squash later

Revert "Fix typed array export... again"

This reverts commit da8d6734fbc31f68e7e822f37fd239a92ac79b34.

Co-Authored-By: Tomek <kobewi4e@gmail.com>

1 files changed, 34 insertions, 27 deletions

diff --git a/scene/resources/packed_scene.cpp b/scene/resources/packed_scene.cpp
index 1cb7c9e574..4d690bd3b1 100644
--- a/scene/resources/packed_scene.cpp
+++ b/scene/resources/packed_scene.cpp
@@ -45,8 +45,6 @@
 
 #define PACKED_SCENE_VERSION 3
 
-const String PackedScene::META_POINTER_PROPERTY_BASE = "metadata/_editor_prop_ptr_";
-
 bool SceneState::can_instantiate() const {
 	return nodes.size() > 0;
 }
@@ -246,13 +244,14 @@ Node *SceneState::instantiate(GenEditState p_edit_state) const {
 						const Variant &prop_variant = props[nprops[j].value];
 
 						if (prop_variant.get_type() == Variant::ARRAY) {
+							const Array &array = prop_variant;
 							if (Engine::get_singleton()->is_editor_hint()) {
-								// If editor, simply set the original array of NodePaths.
-								node->set(prop_name, prop_variant);
-								continue;
+								if (array.get_typed_builtin() == Variant::NODE_PATH) {
+									// If editor, simply set the original array of NodePaths.
+									node->set(prop_name, prop_variant);
+									continue;
+								}
 							}
-
-							const Array &array = prop_variant;
 							for (int k = 0; k < array.size(); k++) {
 								DeferredNodePathProperties dnp;
 								dnp.path = array[k];
@@ -263,16 +262,12 @@ Node *SceneState::instantiate(GenEditState p_edit_state) const {
 							}
 
 						} else {
-							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 set of the property path.
+							DeferredNodePathProperties dnp;
+							dnp.path = prop_variant;
+							dnp.base = node;
+							dnp.property = prop_name;
+							deferred_node_paths.push_back(dnp);
 						}
 						continue;
 					}
@@ -626,9 +621,6 @@ Error SceneState::_parse_node(Node *p_owner, Node *p_node, int p_parent_idx, Has
 		if (E.name == META_PROPERTY_MISSING_RESOURCES) {
 			continue; // Ignore this property when packing.
 		}
-		if (E.name.begins_with(PackedScene::META_POINTER_PROPERTY_BASE)) {
-			continue; // do not save.
-		}
 
 		// If instance or inheriting, not saving if property requested so.
 		if (!states_stack.is_empty()) {
@@ -642,11 +634,15 @@ Error SceneState::_parse_node(Node *p_owner, Node *p_node, int p_parent_idx, Has
 		bool use_deferred_node_path_bit = false;
 
 		if (E.type == Variant::OBJECT && E.hint == PROPERTY_HINT_NODE_TYPE) {
-			value = p_node->get(PackedScene::META_POINTER_PROPERTY_BASE + E.name);
+			if (value.get_type() == Variant::OBJECT) {
+				if (Node *n = Object::cast_to<Node>(value)) {
+					value = p_node->get_path_to(n);
+				}
+				use_deferred_node_path_bit = true;
+			}
 			if (value.get_type() != Variant::NODE_PATH) {
 				continue; //was never set, ignore.
 			}
-			use_deferred_node_path_bit = true;
 		} else if (E.type == Variant::OBJECT && missing_resource_properties.has(E.name)) {
 			// Was this missing resource overridden? If so do not save the old value.
 			Ref<Resource> ures = value;
@@ -665,7 +661,22 @@ Error SceneState::_parse_node(Node *p_owner, Node *p_node, int p_parent_idx, Has
 				}
 				Variant::Type subtype = Variant::Type(subtype_string.to_int());
 
-				use_deferred_node_path_bit = subtype == Variant::OBJECT && subtype_hint == PROPERTY_HINT_NODE_TYPE;
+				if (subtype == Variant::OBJECT && subtype_hint == PROPERTY_HINT_NODE_TYPE) {
+					use_deferred_node_path_bit = true;
+					Array array = value;
+					Array new_array;
+					for (int i = 0; i < array.size(); i++) {
+						Variant elem = array[i];
+						if (elem.get_type() == Variant::OBJECT) {
+							if (Node *n = Object::cast_to<Node>(elem)) {
+								new_array.push_back(p_node->get_path_to(n));
+								continue;
+							}
+						}
+						new_array.push_back(elem);
+					}
+					value = new_array;
+				}
 			}
 		}
 
@@ -1791,10 +1802,6 @@ void SceneState::add_editable_instance(const NodePath &p_path) {
 	editable_instances.push_back(p_path);
 }
 
-String SceneState::get_meta_pointer_property(const String &p_property) {
-	return PackedScene::META_POINTER_PROPERTY_BASE + p_property;
-}
-
 Vector<String> SceneState::_get_node_groups(int p_idx) const {
 	Vector<StringName> groups = get_node_groups(p_idx);
 	Vector<String> ret;