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

Merge pull request #88692 from nongvantinh/fix-88543

Browse Source 
Fix Script Editor saves C# files as embedded scripts.
This commit is contained in:
Rémi Verschelde 2024-02-26 10:49:01 +01:00
commit 5059dd91f3
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
modules/mono/csharp_script.cpp
View File

@ -2851,7 +2851,22 @@ Ref<Resource> ResourceFormatLoaderCSharpScript::load(const String &p_path, const
ERR_FAIL_COND_V_MSG(!scr->get_path().is_empty() && scr->get_path() != p_original_path, Ref<Resource>(), ERR_FAIL_COND_V_MSG(!scr->get_path().is_empty() && scr->get_path() != p_original_path, Ref<Resource>(),
"The C# script path is different from the path it was registered in the C# dictionary."); "The C# script path is different from the path it was registered in the C# dictionary.");
scr->set_path(p_original_path, true); Ref<Resource> existing = ResourceCache::get_ref(p_path);
switch (p_cache_mode) {
case ResourceFormatLoader::CACHE_MODE_IGNORE:
break;
case ResourceFormatLoader::CACHE_MODE_REUSE:
if (existing.is_null()) {
scr->set_path(p_original_path);
} else {
scr = existing;
}
break;
case ResourceFormatLoader::CACHE_MODE_REPLACE:
scr->set_path(p_original_path, true);
break;
}
scr->reload(); scr->reload();
if (r_error) { if (r_error) {