diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2018-07-02 15:08:35 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2018-07-02 15:08:35 -0300 |
| commit | 2dc738ce2733757631a4ccf413a92411c4400246 (patch) | |
| tree | de7d355ea5a2e90e2dbebd6044517cf2b63b090a /scene/main | |
| parent | ecee0c92ff86911fa50e745b4ab98196e0d2afe4 (diff) | |
-Fixes to how hashing happened, now StringName and NodePath use default hasher, this was leading to some severe slowdown in scenarios
-Fixes to some duplication scenarios for instanced scenes
Diffstat (limited to 'scene/main')
| -rw-r--r-- | scene/main/node.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scene/main/node.cpp b/scene/main/node.cpp index 4dc7b03685..6199f52ec5 100644 --- a/scene/main/node.cpp +++ b/scene/main/node.cpp @@ -1934,8 +1934,9 @@ Node *Node::_duplicate(int p_flags, Map<const Node *, Node *> *r_duplimap) const if (E->get().usage & PROPERTY_USAGE_DO_NOT_SHARE_ON_DUPLICATE) { Resource *res = Object::cast_to<Resource>(value); - if (res) // Duplicate only if it's a resource + if (res) { // Duplicate only if it's a resource current_node->set(name, res->duplicate()); + } } else { |