[Bf-blender-cvs] [5a7c041e0c] temp-depsgraph-layers: Attempt to fix selection code (not working though)

[Dalai Felinto]

Commit: 5a7c041e0c25493564dbd796ec9cc72e2999a9bf
Author: Dalai Felinto
Date:   Mon Mar 20 18:27:24 2017 +0100
Branches: temp-depsgraph-layers
https://developer.blender.org/rB5a7c041e0c25493564dbd796ec9cc72e2999a9bf

Attempt to fix selection code (not working though)

===================================================================

M	source/blender/blenkernel/intern/layer.c

===================================================================

diff --git a/source/blender/blenkernel/intern/layer.c b/source/blender/blenkernel/intern/layer.c
index fe638e44b7..de620335d4 100644
--- a/source/blender/blenkernel/intern/layer.c
+++ b/source/blender/blenkernel/intern/layer.c
@@ -1808,11 +1808,11 @@ void BKE_layer_eval_layer_collection(EvaluationContext *UNUSED(eval_ctx),
 
 	layer_collection->flag_evaluated = layer_collection->flag;
 	bool is_visible = (layer_collection->flag & COLLECTION_VISIBLE) != 0;
-	bool is_selectable = (layer_collection->flag & COLLECTION_SELECTABLE) != 0;
+	bool is_selectable = is_visible && ((layer_collection->flag & COLLECTION_SELECTABLE) != 0);
 
 	if (parent_layer_collection != NULL) {
 		is_visible &= (parent_layer_collection->flag_evaluated & COLLECTION_VISIBLE) != 0;
-		is_selectable &= (parent_layer_collection->flag_evaluated & COLLECTION_SELECTABLE) != 0;
+		is_selectable &= is_visible && (parent_layer_collection->flag_evaluated & COLLECTION_SELECTABLE) != 0;
 		layer_collection->flag_evaluated &= parent_layer_collection->flag_evaluated;
 	}