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

Merge pull request #33018 from Xrayez/fix-inst2dict-getters

Browse Source 
Fix `inst2dict` calling to getters to retrieve value
This commit is contained in:
Rémi Verschelde
2019-12-11 15:06:38 +01:00
committed by GitHub
parent cd9d513285 1b9a7e1c21
commit df2e3e3f7f
1 changed files with 3 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
modules/gdscript/gdscript_functions.cpp
View File

@@ -1128,25 +1128,11 @@ void GDScriptFunctions::call(Function p_func, const Variant **p_args, int p_arg_
d["@subpath"] = cp; d["@subpath"] = cp;
d["@path"] = p->get_path(); d["@path"] = p->get_path();
p = base.ptr(); for (Map<StringName, GDScript::MemberInfo>::Element *E = base->member_indices.front(); E; E = E->next()) {
if (!d.has(E->key())) {
while (p) { d[E->key()] = ins->members[E->get().index];
for (Set<StringName>::Element *E = p->members.front(); E; E = E->next()) {
Variant value;
if (ins->get(E->get(), value)) {
String k = E->get();
if (!d.has(k)) {
d[k] = value;
}
}
} }
p = p->_base;
} }
r_ret = d; r_ret = d;
} }
} }