Commit: 9600c7cb059348083ecb7a26827c8a648529c848
Author: Sergey Sharybin
Date: Fri Jun 8 11:25:00 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB9600c7cb059348083ecb7a26827c8a648529c848
Depsgraph: Cleanup, make conditions more clear and less indented
===================================================================
M source/blender/depsgraph/intern/builder/deg_builder_nodes_view_layer.cc
===================================================================
diff --git
a/source/blender/depsgraph/intern/builder/deg_builder_nodes_view_layer.cc
b/source/blender/depsgraph/intern/builder/deg_builder_nodes_view_layer.cc
index 3fc97ee3fcf..7f44356a5cf 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes_view_layer.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes_view_layer.cc
@@ -71,13 +71,13 @@ void DepsgraphNodeBuilder::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(lc->collection);
- }
-
- build_layer_collections(&lc->layer_collections);
+ if (lc->collection->flag & restrict_flag) {
+ continue;
+ }
+ if ((lc->flag & LAYER_COLLECTION_EXCLUDE) == 0) {
+ build_collection(lc->collection);
}
+ build_layer_collections(&lc->layer_collections);
}
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
