godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #37395 from ThakeeNathees/collon-equal-parser-bug-fix 

`:=` fails on some nodes fix: #37357
This commit is contained in:
Rémi Verschelde 2020-04-10 12:36:44 +02:00 committed by GitHub
parent f33bba15b1 bdd7048cb5
commit 67f7ba2645
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/gdscript/gdscript_parser.cpp
View File

@ -7364,6 +7364,8 @@ bool GDScriptParser::_get_member_type(const DataType &p_base_type, const StringN
} }
} }
#define IS_USAGE_MEMBER(m_usage) (!(m_usage & (PROPERTY_USAGE_GROUP | PROPERTY_USAGE_CATEGORY)))
// Check other script types // Check other script types
while (scr.is_valid()) { while (scr.is_valid()) {
Map<StringName, Variant> constants; Map<StringName, Variant> constants;
@ -7376,7 +7378,7 @@ bool GDScriptParser::_get_member_type(const DataType &p_base_type, const StringN
List<PropertyInfo> properties; List<PropertyInfo> properties;
scr->get_script_property_list(&properties); scr->get_script_property_list(&properties);
for (List<PropertyInfo>::Element *E = properties.front(); E; E = E->next()) { for (List<PropertyInfo>::Element *E = properties.front(); E; E = E->next()) {
if (E->get().name == p_member) { if (E->get().name == p_member && IS_USAGE_MEMBER(E->get().usage)) {
r_member_type = _type_from_property(E->get()); r_member_type = _type_from_property(E->get());
return true; return true;
} }
@ -7418,7 +7420,7 @@ bool GDScriptParser::_get_member_type(const DataType &p_base_type, const StringN
List<PropertyInfo> properties; List<PropertyInfo> properties;
ClassDB::get_property_list(native, &properties); ClassDB::get_property_list(native, &properties);
for (List<PropertyInfo>::Element *E = properties.front(); E; E = E->next()) { for (List<PropertyInfo>::Element *E = properties.front(); E; E = E->next()) {
if (E->get().name == p_member) { if (E->get().name == p_member && IS_USAGE_MEMBER(E->get().usage)) {
// Check if a getter exists // Check if a getter exists
StringName getter_name = ClassDB::get_property_getter(native, p_member); StringName getter_name = ClassDB::get_property_getter(native, p_member);
if (getter_name != StringName()) { if (getter_name != StringName()) {
@ -7458,7 +7460,7 @@ bool GDScriptParser::_get_member_type(const DataType &p_base_type, const StringN
List<PropertyInfo> properties; List<PropertyInfo> properties;
ClassDB::get_property_list(native, &properties); ClassDB::get_property_list(native, &properties);
for (List<PropertyInfo>::Element *E = properties.front(); E; E = E->next()) { for (List<PropertyInfo>::Element *E = properties.front(); E; E = E->next()) {
if (E->get().name == p_member) { if (E->get().name == p_member && IS_USAGE_MEMBER(E->get().usage)) {
// Check if a getter exists // Check if a getter exists
StringName getter_name = ClassDB::get_property_getter(native, p_member); StringName getter_name = ClassDB::get_property_getter(native, p_member);
if (getter_name != StringName()) { if (getter_name != StringName()) {
@ -7480,6 +7482,7 @@ bool GDScriptParser::_get_member_type(const DataType &p_base_type, const StringN
} }
} }
} }
#undef IS_USAGE_MEMBER
return false; return false;
} }