Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

-Fix problem of order of import plugins, closes #26340

Browse source 
-Ensure resource previewer does not start until first import is done
This commit is contained in:
Juan Linietsky 2019-02-27 13:31:11 -03:00
parent ce615c1a82
commit a5370b1b1b
5 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
core/io/resource_importer.cpp
View file

@ -406,9 +406,14 @@ bool ResourceFormatImporter::are_import_settings_valid(const String &p_path) con
}
String ResourceFormatImporter::get_import_settings_hash() const {
Vector<Ref<ResourceImporter> > sorted_importers = importers;
sorted_importers.sort_custom<SortImporterByName>();
String hash;
for (int i = 0; i < importers.size(); i++) {
hash += ":" + importers[i]->get_importer_name() + ":" + importers[i]->get_import_settings_string();
for (int i = 0; i < sorted_importers.size(); i++) {
hash += ":" + sorted_importers[i]->get_importer_name() + ":" + sorted_importers[i]->get_import_settings_string();
}
return hash.md5_text();
}

1
core/io/resource_importer.h
View file

@ -77,7 +77,6 @@ public:
void add_importer(const Ref<ResourceImporter> &p_importer) {
importers.push_back(p_importer);
importers.sort_custom<SortImporterByName>();
}
void remove_importer(const Ref<ResourceImporter> &p_importer) { importers.erase(p_importer); }
Ref<ResourceImporter> get_importer_by_name(const String &p_name) const;