Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2016-07-13 11:07:09 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2016-07-13 11:07:09 +0300
commit527674b316b8a2736deb3ef7f64aa2861b03da87 (patch)
tree95c56c1560ce627bd6db8b9589791d6d904f0a6a /source/blender/depsgraph/intern/nodes
parent8939787bfb4b9068408f5fb931354d0fe68faf86 (diff)
Depsgraph: Accumulate object layers from all bases
This solves bug when same object is instanced from multiple bases.
Diffstat (limited to 'source/blender/depsgraph/intern/nodes')
-rw-r--r--source/blender/depsgraph/intern/nodes/deg_node.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/depsgraph/intern/nodes/deg_node.cc b/source/blender/depsgraph/intern/nodes/deg_node.cc
index 12d5ee00a63..db807d22b89 100644
--- a/source/blender/depsgraph/intern/nodes/deg_node.cc
+++ b/source/blender/depsgraph/intern/nodes/deg_node.cc
@@ -181,6 +181,11 @@ void IDDepsNode::init(const ID *id, const string &UNUSED(subdata))
this->layers = (1 << 20) - 1;
this->eval_flags = 0;
+ /* For object we initialize layers to layer from base. */
+ if (GS(id) == ID_OB) {
+ this->layers = 0;
+ }
+
components = BLI_ghash_new(id_deps_node_hash_key,
id_deps_node_hash_key_cmp,
"Depsgraph id components hash");