diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2018-06-21 20:57:33 +0300 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2018-06-21 20:57:33 +0300 |
| commit | 9c02682f23b2b97112ea8c319566c3cbd0eb2337 (patch) | |
| tree | 8c84972e0f4472af50296c350c706db40d598726 /source/blender/depsgraph/intern/builder/deg_builder_relations.cc | |
| parent | c307b13be1c0f9bbf53fe80db28af1a30a821a68 (diff) | |
| parent | 94f3cf23ec8c8ab173b04e036d91f375bdcb544a (diff) | |
Merge branch 'hair_guides' into hair_guides_grooming
Diffstat (limited to 'source/blender/depsgraph/intern/builder/deg_builder_relations.cc')
| -rw-r--r-- | source/blender/depsgraph/intern/builder/deg_builder_relations.cc | 8 |
1 files changed, 8 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 89ab90c68c0..df07b0eccc3 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc @@ -471,6 +471,14 @@ void DepsgraphRelationBuilder::build_collection( DEG_OPCODE_TRANSFORM_LOCAL); if (!group_done) { LISTBASE_FOREACH (CollectionObject *, cob, &collection->gobject) { + if (allow_restrict_flags) { + const int restrict_flag = (graph_->mode == DAG_EVAL_VIEWPORT) + ? OB_RESTRICT_VIEW + : OB_RESTRICT_RENDER; + if (cob->ob->restrictflag & restrict_flag) { + continue; + } + } build_object(NULL, cob->ob); } LISTBASE_FOREACH (CollectionChild *, child, &collection->children) { |