Browse Source

Merge pull request #35270 from ChibiDenDen/fix_extends_sub_subclass

Fix subclass finding in extend statement for sub-sub classes
Rémi Verschelde 5 years ago
parent
commit
f70438ac45
1 changed files with 4 additions and 4 deletions
  1. 4 4
      modules/gdscript/gdscript_parser.cpp

+ 4 - 4
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;