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

Merge pull request #82186 from dalexeev/gds-fix-property-duplication

Browse Source 
GDScript: Fix duplication of inherited script properties
This commit is contained in:
Yuri Sizov
2023-09-28 20:04:18 +02:00
parent 73252669b1 16e860bcb3
commit 78483a1df2
5 changed files with 88 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
modules/gdscript/gdscript.h
View File

@@ -94,12 +94,16 @@ class GDScript : public Script {
GDScript *_base = nullptr; //fast pointer access
GDScript *_owner = nullptr; //for subclasses
HashSet<StringName> members; //members are just indices to the instantiated script.
HashMap<StringName, Variant> constants;
// Members are just indices to the instantiated script.
HashMap<StringName, MemberInfo> member_indices; // Includes member info of all base GDScript classes.
HashSet<StringName> members; // Only members of the current class.
// Only static variables of the current class.
HashMap<StringName, MemberInfo> static_variables_indices;
Vector<Variant> static_variables;
Vector<Variant> static_variables; // Static variable values.
HashMap<StringName, Variant> constants;
HashMap<StringName, GDScriptFunction *> member_functions;
HashMap<StringName, MemberInfo> member_indices; //members are just indices to the instantiated script.
HashMap<StringName, Ref<GDScript>> subclasses;
HashMap<StringName, MethodInfo> _signals;
Dictionary rpc_config;