godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-09 12:50:35 +00:00
Code Releases Wiki Activity

Merge pull request #78254 from dalexeev/gds-fix-property-group-name-conflict

Browse Source 
GDScript: Fix conflict between property and group names
This commit is contained in:
Yuri Sizov
2023-07-31 21:01:03 +02:00
parent 62b4643d85 bf8f996212
commit efbff1369a
4 changed files with 29 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/gdscript/gdscript_parser.h
View File

@@ -753,7 +753,9 @@ public:
members.push_back(Member(p_enum_value));
}
void add_member_group(AnnotationNode *p_annotation_node) {
members_indices[p_annotation_node->export_info.name] = members.size();
// Avoid name conflict. See GH-78252.
StringName name = vformat("@group_%d_%s", members.size(), p_annotation_node->export_info.name);
members_indices[name] = members.size();
members.push_back(Member(p_annotation_node));
}