summaryrefslogtreecommitdiffstats
path: root/modules/gdscript/gdscript_parser.h
diff options
context:
space:
mode:
authorBojidar Marinov <bojidar.marinov.bg@gmail.com>2019-07-03 17:59:29 +0300
committerBojidar Marinov <bojidar.marinov.bg@gmail.com>2019-07-03 17:59:29 +0300
commit2ef438c20016339a793ee8723652c7d3c726a0c6 (patch)
tree4523e7ed3e15b099435daf87b303842fe7a9a3fc /modules/gdscript/gdscript_parser.h
parent4cb0887660861402fe6857662e622488adb86514 (diff)
downloadredot-engine-2ef438c20016339a793ee8723652c7d3c726a0c6.tar.gz
Fix inheriting from class_name messing up constants
Fixes #29586
Diffstat (limited to 'modules/gdscript/gdscript_parser.h')
-rw-r--r--modules/gdscript/gdscript_parser.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/gdscript/gdscript_parser.h b/modules/gdscript/gdscript_parser.h
index 5e4de11357..0bed4cb0a5 100644
--- a/modules/gdscript/gdscript_parser.h
+++ b/modules/gdscript/gdscript_parser.h
@@ -599,7 +599,7 @@ private:
void _parse_class(ClassNode *p_class);
bool _end_statement();
- void _determine_inheritance(ClassNode *p_class);
+ void _determine_inheritance(ClassNode *p_class, bool p_recursive = true);
bool _parse_type(DataType &r_type, bool p_can_be_void = false);
DataType _resolve_type(const DataType &p_source, int p_line);
DataType _type_from_variant(const Variant &p_value) const;