From a5370b1b1bed3744941c90b4a05d4516aabd4c67 Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Wed, 27 Feb 2019 13:31:11 -0300 Subject: -Fix problem of order of import plugins, closes #26340 -Ensure resource previewer does not start until first import is done --- core/io/resource_importer.cpp | 9 +++++++-- core/io/resource_importer.h | 1 - 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'core/io') diff --git a/core/io/resource_importer.cpp b/core/io/resource_importer.cpp index 427ce2c2cd..69907a710a 100644 --- a/core/io/resource_importer.cpp +++ b/core/io/resource_importer.cpp @@ -406,9 +406,14 @@ bool ResourceFormatImporter::are_import_settings_valid(const String &p_path) con } String ResourceFormatImporter::get_import_settings_hash() const { + + Vector > sorted_importers = importers; + + sorted_importers.sort_custom(); + 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(); } diff --git a/core/io/resource_importer.h b/core/io/resource_importer.h index db1befb51e..1d27d4dec3 100644 --- a/core/io/resource_importer.h +++ b/core/io/resource_importer.h @@ -77,7 +77,6 @@ public: void add_importer(const Ref &p_importer) { importers.push_back(p_importer); - importers.sort_custom(); } void remove_importer(const Ref &p_importer) { importers.erase(p_importer); } Ref get_importer_by_name(const String &p_name) const; -- cgit v1.2.3