diff options
author | Thomas Herzog <thomas.herzog@mail.com> | 2017-08-09 23:07:42 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-08-09 23:07:42 +0200 |
commit | e93ce339dcdf4e9ade63286cfa04cdd4b5a8ecd4 (patch) | |
tree | 5cc6a7ddfe3cf85204dfef1d3ad5a180d1152d50 /modules | |
parent | b5c6b0cf1c3d644321ed134dbb26e111d6dbd43f (diff) | |
parent | 9c1afce38eef4f51e98165e2dcdd170b81e97ce1 (diff) |
Merge pull request #10206 from endragor/show-base-nativescript-props
Allow to edit base type NativeScript properties
Diffstat (limited to 'modules')
-rw-r--r-- | modules/nativescript/nativescript.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/modules/nativescript/nativescript.cpp b/modules/nativescript/nativescript.cpp index 2212c73766..e2717b8448 100644 --- a/modules/nativescript/nativescript.cpp +++ b/modules/nativescript/nativescript.cpp @@ -77,14 +77,12 @@ void NativeScript::_update_placeholder(PlaceHolderScriptInstance *p_placeholder) ERR_FAIL_COND(!script_data); List<PropertyInfo> info; + get_script_property_list(&info); Map<StringName, Variant> values; - - for (Map<StringName, NativeScriptDesc::Property>::Element *E = script_data->properties.front(); E; E = E->next()) { - PropertyInfo p = E->get().info; - p.name = String(E->key()); - - info.push_back(p); - values[p.name] = E->get().default_value; + for (List<PropertyInfo>::Element *E = info.front(); E; E = E->next()) { + Variant value; + get_property_default_value(E->get().name, value); + values[E->get().name] = value; } p_placeholder->update(info, values); |