diff options
author | RĂ©mi Verschelde <rverschelde@gmail.com> | 2020-01-19 23:18:40 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-01-19 23:18:40 +0100 |
commit | f70438ac455577d6d6609879984f6840d97c47d1 (patch) | |
tree | 8b70fdfc1cdf591c6861e52a0be3ce7b9e1d857f | |
parent | b9e12f24a83774148909bf9416e60cf88d9b8ec9 (diff) | |
parent | 8f5e424c66f6db6e5726550ec90303ed2c594797 (diff) |
Merge pull request #35270 from ChibiDenDen/fix_extends_sub_subclass
Fix subclass finding in extend statement for sub-sub classes
-rw-r--r-- | modules/gdscript/gdscript_parser.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/modules/gdscript/gdscript_parser.cpp b/modules/gdscript/gdscript_parser.cpp index 5c2e7137bf..aec7110ee5 100644 --- a/modules/gdscript/gdscript_parser.cpp +++ b/modules/gdscript/gdscript_parser.cpp @@ -5404,12 +5404,12 @@ void GDScriptParser::_determine_inheritance(ClassNode *p_class, bool p_recursive ident += ("." + subclass); - if (base_script->get_subclasses().has(subclass)) { + if (find_subclass->get_subclasses().has(subclass)) { - find_subclass = base_script->get_subclasses()[subclass]; - } else if (base_script->get_constants().has(subclass)) { + find_subclass = find_subclass->get_subclasses()[subclass]; + } else if (find_subclass->get_constants().has(subclass)) { - Ref<GDScript> new_base_class = base_script->get_constants()[subclass]; + Ref<GDScript> new_base_class = find_subclass->get_constants()[subclass]; if (new_base_class.is_null()) { _set_error("Constant isn't a class: " + ident, p_class->line); return; |