Fix import order, so scenes are imported after textures.

Also fix bugs when meshes are always generated.

1 files changed, 14 insertions, 2 deletions

diff --git a/editor/editor_file_system.cpp b/editor/editor_file_system.cpp
index 6e12a8fd0..481f2a817 100644
--- a/editor/editor_file_system.cpp
+++ b/editor/editor_file_system.cpp
@@ -1498,10 +1498,22 @@ void EditorFileSystem::reimport_files(const Vector<String> &p_files) {
 
 	importing = true;
 	EditorProgress pr("reimport", TTR("(Re)Importing Assets"), p_files.size());
+
+	Vector<ImportFile> files;
+
 	for (int i = 0; i < p_files.size(); i++) {
-		pr.step(p_files[i].get_file(), i);
+		ImportFile ifile;
+		ifile.path = p_files[i];
+		ifile.order = ResourceFormatImporter::get_singleton()->get_import_order(p_files[i]);
+		files.push_back(ifile);
+	}
+
+	files.sort();
+
+	for (int i = 0; i < files.size(); i++) {
+		pr.step(files[i].path.get_file(), i);
 
-		_reimport_file(p_files[i]);
+		_reimport_file(files[i].path);
 	}
 
 	_save_filesystem_cache();