Commit: 984a78e76385a3dc02a956ea903754fdb177bd97
Author: Brecht Van Lommel
Date: Wed Jun 20 13:42:23 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB984a78e76385a3dc02a956ea903754fdb177bd97
Fix crash opening some files, after recent changes.
===================================================================
M source/blender/depsgraph/intern/builder/deg_builder_relations.cc
===================================================================
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);
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
