Commit: d38c7db5e1cc394a602dfeb35cb2e145d0b0220b
Author: Sergey Sharybin
Date: Fri Jun 8 11:46:51 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBd38c7db5e1cc394a602dfeb35cb2e145d0b0220b
Depsgraph: Cleanup, make conditions more clear and less indented
===================================================================
M
source/blender/depsgraph/intern/builder/deg_builder_relations_view_layer.cc
===================================================================
diff --git
a/source/blender/depsgraph/intern/builder/deg_builder_relations_view_layer.cc
b/source/blender/depsgraph/intern/builder/deg_builder_relations_view_layer.cc
index ce0571362c6..b940fc3035e 100644
---
a/source/blender/depsgraph/intern/builder/deg_builder_relations_view_layer.cc
+++
b/source/blender/depsgraph/intern/builder/deg_builder_relations_view_layer.cc
@@ -75,13 +75,13 @@ void
DepsgraphRelationBuilder::build_layer_collections(ListBase *lb)
COLLECTION_RESTRICT_VIEW : COLLECTION_RESTRICT_RENDER;
for (LayerCollection *lc = (LayerCollection *)lb->first; lc; lc =
lc->next) {
- if (!(lc->collection->flag & restrict_flag)) {
- if (!(lc->flag & LAYER_COLLECTION_EXCLUDE)) {
- build_collection(DEG_COLLECTION_OWNER_SCENE,
NULL, lc->collection);
- }
-
- build_layer_collections(&lc->layer_collections);
+ if ((lc->collection->flag & restrict_flag)) {
+ continue;
+ }
+ if ((lc->flag & LAYER_COLLECTION_EXCLUDE) == 0) {
+ build_collection(DEG_COLLECTION_OWNER_SCENE, NULL,
lc->collection);
}
+ build_layer_collections(&lc->layer_collections);
}
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
