asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #97769 from dalexeev/gds-fix-gdscript-cache-path

Browse source 
GDScript: Fix `GDScriptCache::get_full_script()` uses non-remapped path
This commit is contained in:
Rémi Verschelde 2024-10-04 11:22:14 +02:00
commit 32239d477b
No known key found for this signature in database
GPG key ID: C3336907360768E1
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
modules/gdscript/gdscript_cache.cpp
View file

@ -297,6 +297,7 @@ Vector<uint8_t> GDScriptCache::get_binary_tokens(const String &p_path) {
Ref<GDScript> GDScriptCache::get_shallow_script(const String &p_path, Error &r_error, const String &p_owner) { Ref<GDScript> GDScriptCache::get_shallow_script(const String &p_path, Error &r_error, const String &p_owner) {
MutexLock lock(singleton->mutex); MutexLock lock(singleton->mutex);
if (!p_owner.is_empty()) { if (!p_owner.is_empty()) {
singleton->dependencies[p_owner].insert(p_path); singleton->dependencies[p_owner].insert(p_path);
} }
@ -307,7 +308,7 @@ Ref<GDScript> GDScriptCache::get_shallow_script(const String &p_path, Error &r_e
return singleton->shallow_gdscript_cache[p_path]; return singleton->shallow_gdscript_cache[p_path];
} }
String remapped_path = ResourceLoader::path_remap(p_path); const String remapped_path = ResourceLoader::path_remap(p_path);
Ref<GDScript> script; Ref<GDScript> script;
script.instantiate(); script.instantiate();
@ -332,6 +333,7 @@ Ref<GDScript> GDScriptCache::get_shallow_script(const String &p_path, Error &r_e
} }
singleton->shallow_gdscript_cache[p_path] = script; singleton->shallow_gdscript_cache[p_path] = script;
return script; return script;
} }
@ -359,16 +361,18 @@ Ref<GDScript> GDScriptCache::get_full_script(const String &p_path, Error &r_erro
} }
} }
const String remapped_path = ResourceLoader::path_remap(p_path);
if (p_update_from_disk) { if (p_update_from_disk) {
if (p_path.get_extension().to_lower() == "gdc") { if (remapped_path.get_extension().to_lower() == "gdc") {
Vector<uint8_t> buffer = get_binary_tokens(p_path); Vector<uint8_t> buffer = get_binary_tokens(remapped_path);
if (buffer.is_empty()) { if (buffer.is_empty()) {
r_error = ERR_FILE_CANT_READ; r_error = ERR_FILE_CANT_READ;
return script; return script;
} }
script->set_binary_tokens_source(buffer); script->set_binary_tokens_source(buffer);
} else { } else {
r_error = script->load_source_code(p_path); r_error = script->load_source_code(remapped_path);
if (r_error) { if (r_error) {
return script; return script;
} }