summaryrefslogtreecommitdiffstats
path: root/modules/gdscript/gdscript_compiler.cpp
diff options
context:
space:
mode:
authorRémi Verschelde <remi@verschelde.fr>2022-11-28 11:45:11 +0100
committerGitHub <noreply@github.com>2022-11-28 11:45:11 +0100
commit166066d9f74e574b68d9f9d0ba05bf42b8de2131 (patch)
tree7ccadae0c01ec2474c894cec8f4936e2804577af /modules/gdscript/gdscript_compiler.cpp
parentceca46078358543a22dec85e9c9b525ddaf8110e (diff)
parent4e6068969527ae4f55adf24865d511727d1da3b4 (diff)
downloadredot-engine-166066d9f74e574b68d9f9d0ba05bf42b8de2131.tar.gz
Merge pull request #69259 from adamscott/fix-cyclic-reference-base-issue
Fix cyclic reference base being loaded but not valid (which is ok)
Diffstat (limited to 'modules/gdscript/gdscript_compiler.cpp')
-rw-r--r--modules/gdscript/gdscript_compiler.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/gdscript/gdscript_compiler.cpp b/modules/gdscript/gdscript_compiler.cpp
index f0ceb42f89..103eb60da9 100644
--- a/modules/gdscript/gdscript_compiler.cpp
+++ b/modules/gdscript/gdscript_compiler.cpp
@@ -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;