Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-10-20 00:13:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

GDScript: Fix conflict between property and group names

Browse source 
(cherry picked from commit bf8f996212)
This commit is contained in:
Danil Alexeev 2023-06-15 08:02:42 +03:00 • committed by Yuri Sizov
parent c4be3487ca
commit 102f93b8b8
4 changed files with 29 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
modules/gdscript/gdscript_compiler.cpp
View file

@ -2705,20 +2705,21 @@ Error GDScriptCompiler::_populate_class_members(GDScript *p_script, const GDScri
case GDScriptParser::ClassNode::Member::GROUP: {
const GDScriptParser::AnnotationNode *annotation = member.annotation;
StringName name = annotation->export_info.name;
// Avoid name conflict. See GH-78252.
StringName name = vformat("@group_%d_%s", p_script->members.size(), annotation->export_info.name);
// This is not a normal member, but we need this to keep indices in order.
GDScript::MemberInfo minfo;
minfo.index = p_script->member_indices.size();
PropertyInfo prop_info;
prop_info.name = name;
prop_info.name = annotation->export_info.name;
prop_info.usage = annotation->export_info.usage;
prop_info.hint_string = annotation->export_info.hint_string;
p_script->member_info[name] = prop_info;
p_script->member_indices[name] = minfo;
p_script->members.insert(name);
p_script->members.insert(Variant());
} break;
default: