godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #95689 from Hilderin/fix-uid-paths-fail-editor-startup 

Fix `uid://` paths fail to load at editor startup
This commit is contained in:
Rémi Verschelde 2024-08-19 12:09:25 +02:00
parent 9cc53a134e b1c97313e0
commit 846f43c7fc
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
editor/editor_file_system.cpp
View File

@ -386,6 +386,8 @@ void EditorFileSystem::_scan_filesystem() {
// On the first scan, the first_scan_root_dir is created in _first_scan_filesystem. // On the first scan, the first_scan_root_dir is created in _first_scan_filesystem.
if (first_scan) { if (first_scan) {
sd = first_scan_root_dir; sd = first_scan_root_dir;
// Will be updated on scan.
ResourceUID::get_singleton()->clear();
} else { } else {
Ref<DirAccess> d = DirAccess::create(DirAccess::ACCESS_RESOURCES); Ref<DirAccess> d = DirAccess::create(DirAccess::ACCESS_RESOURCES);
sd = memnew(ScannedDirectory); sd = memnew(ScannedDirectory);
@ -3061,7 +3063,6 @@ EditorFileSystem::EditorFileSystem() {
using_fat32_or_exfat = (da->get_filesystem_type() == "FAT32" || da->get_filesystem_type() == "exFAT"); using_fat32_or_exfat = (da->get_filesystem_type() == "FAT32" || da->get_filesystem_type() == "exFAT");
scan_total = 0; scan_total = 0;
callable_mp(ResourceUID::get_singleton(), &ResourceUID::clear).call_deferred(); // Will be updated on scan.
ResourceSaver::set_get_resource_id_for_path(_resource_saver_get_resource_id_for_path); ResourceSaver::set_get_resource_id_for_path(_resource_saver_get_resource_id_for_path);
} }