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

Fix cyclic reference base being loaded but not valid (which is ok)

This commit is contained in:
Adam Scott 2022-11-27 10:31:53 -05:00
parent 690199b7dd
commit 4e60689695
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;