Merge pull request #72492 from maiself/fix-binary-res-typed-array

Fix loading of binary resources with typed arrays
godotengine · Feb 1, 2023 · 68299e0 · 68299e0
2 parents 9aeda3b + 87e6885
commit 68299e0
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/core/io/resource_format_binary.cpp b/core/io/resource_format_binary.cpp
@@ -832,6 +832,18 @@ Error ResourceLoaderBinary::load() {
 				}
 			}
 
+			if (value.get_type() == Variant::ARRAY) {
+				Array set_array = value;
+				bool is_get_valid = false;
+				Variant get_value = res->get(name, &is_get_valid);
+				if (is_get_valid && get_value.get_type() == Variant::ARRAY) {
+					Array get_array = get_value;
+					if (!set_array.is_same_typed(get_array)) {
+						value = Array(set_array, get_array.get_typed_builtin(), get_array.get_typed_class_name(), get_array.get_typed_script());
+					}
+				}
+			}
+
 			if (set_valid) {
 				res->set(name, value);
 			}