diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-06-06 13:35:00 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-06-06 13:36:52 +0300 |
| commit | e3324c3a8ef68b2d4c866b799fe94e629731a9ba (patch) | |
| tree | deeca0100adfdf5502fcc4173805a3e82cb0132d /source/blender | |
| parent | 22370929fe407eb43bdc7511799fa655e14a4b9e (diff) | |
Depsgraph: Silence relations builder errors
Were caused by depsgraph trying to create relations between objects
which are coming from restricted collection.
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/depsgraph/intern/builder/deg_builder_relations.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc index 26f5c167627..f02a48e803e 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc @@ -473,7 +473,12 @@ void DepsgraphRelationBuilder::build_collection(Object *object, Collection *coll } if (object != NULL) { const ListBase group_objects = BKE_collection_object_cache_get(collection); + const int base_flag = (graph_->mode == DAG_EVAL_VIEWPORT) ? + BASE_VISIBLE_VIEWPORT : BASE_VISIBLE_RENDER; LISTBASE_FOREACH (Base *, base, &group_objects) { + if ((base->flag & base_flag) == 0) { + continue; + } ComponentKey dupli_transform_key(&base->object->id, DEG_NODE_TYPE_TRANSFORM); add_relation(dupli_transform_key, object_local_transform_key, "Dupligroup"); } |