asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix duplication of nodes resulting in shared metadata

Browse source 
Fixes #9547
This commit is contained in:
Bojidar Marinov 2017-09-11 12:34:36 +03:00
parent 5f39f3a2df
commit ebee9898ca
No known key found for this signature in database
GPG key ID: 4D546A8F1E091856
2 changed files with 27 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
editor/scene_tree_dock.cpp
View file

@ -823,7 +823,14 @@ Node *SceneTreeDock::_duplicate(Node *p_node, Map<Node *, Node *> &duplimap) {
if (!(E->get().usage & PROPERTY_USAGE_STORAGE)) if (!(E->get().usage & PROPERTY_USAGE_STORAGE))
continue; continue;
String name = E->get().name; String name = E->get().name;
node->set(name, p_node->get(name)); Variant value = p_node->get(name);
// Duplicate dictionaries and arrays, mainly needed for __meta__
if (value.get_type() == Variant::DICTIONARY) {
value = Dictionary(value).copy();
} else if (value.get_type() == Variant::ARRAY) {
value = Array(value).duplicate();
}
node->set(name, value);
} }
List<Node::GroupInfo> group_info; List<Node::GroupInfo> group_info;

21
scene/main/node.cpp
View file

@ -2117,7 +2117,15 @@ Node *Node::_duplicate(int p_flags) const {
if (!(p_flags & DUPLICATE_SCRIPTS) && name == "script/script") if (!(p_flags & DUPLICATE_SCRIPTS) && name == "script/script")
continue; continue;
node->set(name, get(name)); Variant value = get(name);
// Duplicate dictionaries and arrays, mainly needed for __meta__
if (value.get_type() == Variant::DICTIONARY) {
value = Dictionary(value).copy();
} else if (value.get_type() == Variant::ARRAY) {
value = Array(value).duplicate();
}
node->set(name, value);
} }
node->set_name(get_name()); node->set_name(get_name());
@ -2199,7 +2207,16 @@ void Node::_duplicate_and_reown(Node *p_new_parent, const Map<Node *, Node *> &p
if (!(E->get().usage & PROPERTY_USAGE_STORAGE)) if (!(E->get().usage & PROPERTY_USAGE_STORAGE))
continue; continue;
String name = E->get().name; String name = E->get().name;
node->set(name, get(name));
Variant value = get(name);
// Duplicate dictionaries and arrays, mainly needed for __meta__
if (value.get_type() == Variant::DICTIONARY) {
value = Dictionary(value).copy();
} else if (value.get_type() == Variant::ARRAY) {
value = Array(value).duplicate();
}
node->set(name, value);
} }
node->set_name(get_name()); node->set_name(get_name());