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

Merge pull request #83039 from KoBeWi/it's_always_the_cache 

Fix GDScript cache assigning UID as scene path
This commit is contained in:
Rémi Verschelde 2023-11-10 10:44:33 +01:00
parent 38c3e5aae9 6849cf48d1
commit a9c864dc35
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
modules/gdscript/gdscript_cache.cpp
View File

@ -364,28 +364,33 @@ void GDScriptCache::remove_static_script(const String &p_fqcn) {
Ref<PackedScene> GDScriptCache::get_packed_scene(const String &p_path, Error &r_error, const String &p_owner) { Ref<PackedScene> GDScriptCache::get_packed_scene(const String &p_path, Error &r_error, const String &p_owner) {
MutexLock lock(singleton->mutex); MutexLock lock(singleton->mutex);
if (singleton->packed_scene_cache.has(p_path)) { String path = p_path;
singleton->packed_scene_dependencies[p_path].insert(p_owner); if (path.begins_with("uid://")) {
return singleton->packed_scene_cache[p_path]; path = ResourceUID::get_singleton()->get_id_path(ResourceUID::get_singleton()->text_to_id(path));
} }
Ref<PackedScene> scene = ResourceCache::get_ref(p_path); if (singleton->packed_scene_cache.has(path)) {
singleton->packed_scene_dependencies[path].insert(p_owner);
return singleton->packed_scene_cache[path];
}
Ref<PackedScene> scene = ResourceCache::get_ref(path);
if (scene.is_valid()) { if (scene.is_valid()) {
singleton->packed_scene_cache[p_path] = scene; singleton->packed_scene_cache[path] = scene;
singleton->packed_scene_dependencies[p_path].insert(p_owner); singleton->packed_scene_dependencies[path].insert(p_owner);
return scene; return scene;
} }
scene.instantiate(); scene.instantiate();
r_error = OK; r_error = OK;
if (p_path.is_empty()) { if (path.is_empty()) {
r_error = ERR_FILE_BAD_PATH; r_error = ERR_FILE_BAD_PATH;
return scene; return scene;
} }
scene->set_path(p_path); scene->set_path(path);
singleton->packed_scene_cache[p_path] = scene; singleton->packed_scene_cache[path] = scene;
singleton->packed_scene_dependencies[p_path].insert(p_owner); singleton->packed_scene_dependencies[path].insert(p_owner);
scene->reload_from_file(); scene->reload_from_file();
return scene; return scene;