Merge pull request #30289 from bojidar-bg/29586-class-name-constant

Fix inheriting from class_name messing up constants
This commit is contained in:
Rémi Verschelde 2019-07-03 21:25:20 +02:00 committed by GitHub
commit e81ddf1242
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 10 deletions

View file

@ -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;