diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-07-03 21:25:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-03 21:25:20 +0200 |
| commit | e81ddf1242aa5b8e4f1736952ac7461d1d76459d (patch) | |
| tree | a0feb54b2c2e838107514d6f498558643492383e /modules/gdscript/gdscript_parser.h | |
| parent | 9f666da2b2deb27e144f2fb5276fa724ecf8cd29 (diff) | |
| parent | 2ef438c20016339a793ee8723652c7d3c726a0c6 (diff) | |
| download | redot-engine-e81ddf1242aa5b8e4f1736952ac7461d1d76459d.tar.gz | |
Merge pull request #30289 from bojidar-bg/29586-class-name-constant
Fix inheriting from class_name messing up constants
Diffstat (limited to 'modules/gdscript/gdscript_parser.h')
| -rw-r--r-- | modules/gdscript/gdscript_parser.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/gdscript/gdscript_parser.h b/modules/gdscript/gdscript_parser.h index 18ca352372..62d7bdb393 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; |