Jelajahi Sumber

Merge pull request #51463 from SaracenOne/assign_path_fix

Assign embedded text resource path earlier to prevent error on embedded scripts
Rémi Verschelde 4 tahun lalu
induk
melakukan
d56da233c4
1 mengubah file dengan 6 tambahan dan 6 penghapusan
  1. 6 6
      scene/resources/resource_format_text.cpp

+ 6 - 6
scene/resources/resource_format_text.cpp

@@ -558,6 +558,12 @@ Error ResourceLoaderText::load() {
 
 		resource_current++;
 
+		int_resources[id] = res; //always assign int resources
+		if (do_assign && cache_mode != ResourceFormatLoader::CACHE_MODE_IGNORE) {
+			res->set_path(path, cache_mode == ResourceFormatLoader::CACHE_MODE_REPLACE);
+			res->set_scene_unique_id(id);
+		}
+
 		while (true) {
 			String assign;
 			Variant value;
@@ -585,12 +591,6 @@ Error ResourceLoaderText::load() {
 			}
 		}
 
-		int_resources[id] = res; //always assign int resources
-		if (do_assign && cache_mode != ResourceFormatLoader::CACHE_MODE_IGNORE) {
-			res->set_path(path, cache_mode == ResourceFormatLoader::CACHE_MODE_REPLACE);
-			res->set_scene_unique_id(id);
-		}
-
 		if (progress && resources_total > 0) {
 			*progress = resource_current / float(resources_total);
 		}