diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-06-20 14:42:23 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-06-20 14:42:23 +0300 |
| commit | 984a78e76385a3dc02a956ea903754fdb177bd97 (patch) | |
| tree | 34a97ab7294f9a336a999eb0a1fdbec92991eba6 | |
| parent | 4234cddda9ed59e5a7fff7043a2add2aaf158d23 (diff) | |
Fix crash opening some files, after recent changes.
| -rw-r--r-- | source/blender/depsgraph/intern/builder/deg_builder_relations.cc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc index e728ae787c2..d0b699d34e4 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc @@ -469,11 +469,13 @@ void DepsgraphRelationBuilder::build_collection( DEG_OPCODE_TRANSFORM_LOCAL); if (!group_done) { LISTBASE_FOREACH (CollectionObject *, cob, &collection->gobject) { - const int restrict_flag = (graph_->mode == DAG_EVAL_VIEWPORT) - ? OB_RESTRICT_VIEW - : OB_RESTRICT_RENDER; - if (cob->ob->restrictflag & restrict_flag) { - continue; + 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); } |