Skip to content

Commit

Permalink
Fix slow editor load on large projects (v2)
Browse files Browse the repository at this point in the history
  • Loading branch information
Hilderin committed Sep 20, 2024
1 parent 2be730a commit 8ff22ad
Show file tree
Hide file tree
Showing 10 changed files with 217 additions and 111 deletions.
2 changes: 1 addition & 1 deletion core/io/resource_importer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
Expand Down
2 changes: 1 addition & 1 deletion core/io/resource_importer.h
Original file line number Diff line number Diff line change
Expand Up @@ -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(); }
};

Expand Down
1 change: 0 additions & 1 deletion drivers/unix/file_access_unix.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
Expand Down
1 change: 0 additions & 1 deletion drivers/windows/file_access_windows.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,6 @@ uint64_t FileAccessWindows::_get_modified_time(const String &p_file) {
}
}

print_verbose("Failed to get modified time for: " + p_file);
return 0;
}

Expand Down
Loading

0 comments on commit 8ff22ad

Please sign in to comment.