godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-01-05 19:31:35 +00:00
Code Releases Wiki Activity

Fix import order, so scenes are imported after textures.

Browse Source 
Also fix bugs when meshes are always generated.
This commit is contained in:
Juan Linietsky
2017-09-20 20:59:19 -03:00
parent 71e4fae3a1
commit 423ca9bcaf
10 changed files with 105 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
editor/editor_file_system.cpp
View File

@@ -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());
for (int i = 0; i < p_files.size(); i++) {
pr.step(p_files[i].get_file(), i);
_reimport_file(p_files[i]);
Vector<ImportFile> files;
for (int i = 0; i < p_files.size(); 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(files[i].path);
}
_save_filesystem_cache();