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

Merge pull request #69259 from adamscott/fix-cyclic-reference-base-issue

Browse source 
Fix cyclic reference base being loaded but not valid (which is ok)
This commit is contained in:
Rémi Verschelde 2022-11-28 11:45:11 +01:00 committed by GitHub
commit 166066d9f7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/gdscript/gdscript_cache.cpp
View file

@ -260,7 +260,7 @@ Ref<GDScript> GDScriptCache::get_full_script(const String &p_path, Error &r_erro
Ref<GDScript> script;
r_error = OK;
if (singleton->full_gdscript_cache.has(p_path)) {
script = Ref<GDScript>(singleton->full_gdscript_cache[p_path]);
script = singleton->full_gdscript_cache[p_path];
if (!p_update_from_disk) {
return script;
}

2
modules/gdscript/gdscript_compiler.cpp
View file

@ -2284,7 +2284,7 @@ Error GDScriptCompiler::_populate_class_members(GDScript *p_script, const GDScri
_set_error(vformat(R"(Could not find class "%s" in "%s".)", base->fully_qualified_name, base->path), nullptr);
return ERR_COMPILATION_FAILED;
}
ERR_FAIL_COND_V(!base->is_valid(), ERR_BUG);
ERR_FAIL_COND_V(!base->is_valid() && !base->reloading, ERR_BUG);
}
p_script->base = base;