diff options
author | Juan Linietsky <reduzio@gmail.com> | 2016-01-22 19:36:40 -0300 |
---|---|---|
committer | Juan Linietsky <reduzio@gmail.com> | 2016-01-22 19:36:40 -0300 |
commit | b30839fb08e4e17ca9ba3a76aa46bb263c62e7b6 (patch) | |
tree | 37fe88caa56d4f9096b1a5cff422b21f46527eb0 /scene/main/instance_placeholder.cpp | |
parent | 84d7a559e5198478b1ae23d00dbd966461aadfe7 (diff) | |
download | redot-engine-b30839fb08e4e17ca9ba3a76aa46bb263c62e7b6.tar.gz |
-make sure instance placeholder works with duplicate(), fixes #3378
Diffstat (limited to 'scene/main/instance_placeholder.cpp')
-rw-r--r-- | scene/main/instance_placeholder.cpp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/scene/main/instance_placeholder.cpp b/scene/main/instance_placeholder.cpp index 12f6086bf0..f822107918 100644 --- a/scene/main/instance_placeholder.cpp +++ b/scene/main/instance_placeholder.cpp @@ -14,11 +14,24 @@ bool InstancePlaceholder::_set(const StringName& p_name, const Variant& p_value) bool InstancePlaceholder::_get(const StringName& p_name,Variant &r_ret) const{ + for (const List<PropSet>::Element *E=stored_values.front();E;E=E->next()) { + if (E->get().name==p_name) { + r_ret=E->get().value; + return true; + } + } return false; } void InstancePlaceholder::_get_property_list( List<PropertyInfo> *p_list) const{ + for (const List<PropSet>::Element *E=stored_values.front();E;E=E->next()) { + PropertyInfo pi; + pi.name=E->get().name; + pi.type=E->get().value.get_type(); + pi.usage=PROPERTY_USAGE_STORAGE; + p_list->push_back(pi); + } } |