Fix slow editor load on large projects (v2)

godotengine · Sep 9, 2024 · c1e39e9 · c1e39e9
1 parent 27552a2
commit c1e39e9
Show file tree

Hide file tree

Showing 10 changed files with 217 additions and 111 deletions.
diff --git a/core/io/resource_importer.cpp b/core/io/resource_importer.cpp
@@ -507,7 +507,7 @@ bool ResourceFormatImporter::are_import_settings_valid(const String &p_path) con
 
 	for (int i = 0; i < importers.size(); i++) {
 		if (importers[i]->get_importer_name() == pat.importer) {
-			if (!importers[i]->are_import_settings_valid(p_path)) { //importer thinks this is not valid
+			if (!importers[i]->are_import_settings_valid(p_path, pat.metadata)) { //importer thinks this is not valid
 				return false;
 			}
 		}

diff --git a/core/io/resource_importer.h b/core/io/resource_importer.h
@@ -153,7 +153,7 @@ class ResourceImporter : public RefCounted {
 	virtual void import_threaded_end() {}
 
 	virtual Error import_group_file(const String &p_group_file, const HashMap<String, HashMap<StringName, Variant>> &p_source_file_options, const HashMap<String, String> &p_base_paths) { return ERR_UNAVAILABLE; }
-	virtual bool are_import_settings_valid(const String &p_path) const { return true; }
+	virtual bool are_import_settings_valid(const String &p_path, const Dictionary &p_meta) const { return true; }
 	virtual String get_import_settings_string() const { return String(); }
 };
 

diff --git a/drivers/unix/file_access_unix.cpp b/drivers/unix/file_access_unix.cpp
@@ -294,7 +294,6 @@ uint64_t FileAccessUnix::_get_modified_time(const String &p_file) {
 	if (!err) {
 		return status.st_mtime;
 	} else {
-		WARN_PRINT("Failed to get modified time for: " + p_file);
 		return 0;
 	}
 }

diff --git a/drivers/windows/file_access_windows.cpp b/drivers/windows/file_access_windows.cpp
@@ -418,7 +418,6 @@ uint64_t FileAccessWindows::_get_modified_time(const String &p_file) {
 	if (rv == 0) {
 		return st.st_mtime;
 	} else {
-		print_verbose("Failed to get modified time for: " + p_file + "");
 		return 0;
 	}
 }