[Bf-blender-cvs] [b5a0406fd23] temp-outliner-visibility: Outliner: Gray out collections only when they are invisible

Dalai Felinto noreply at git.blender.org
Fri Nov 30 05:36:38 CET 2018


Commit: b5a0406fd23d774b47d181a7515c13303e69d5dd
Author: Dalai Felinto
Date:   Thu Nov 29 18:56:10 2018 -0200
Branches: temp-outliner-visibility
https://developer.blender.org/rBb5a0406fd23d774b47d181a7515c13303e69d5dd

Outliner: Gray out collections only when they are invisible

Re-factor of 4521d3e7074d.

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

M	source/blender/editors/space_outliner/outliner_tree.c

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

diff --git a/source/blender/editors/space_outliner/outliner_tree.c b/source/blender/editors/space_outliner/outliner_tree.c
index 60467854e73..2ce08fb6f77 100644
--- a/source/blender/editors/space_outliner/outliner_tree.c
+++ b/source/blender/editors/space_outliner/outliner_tree.c
@@ -1315,8 +1315,7 @@ static void outliner_add_layer_collections_recursive(
 
 		const bool exclude = (lc->flag & LAYER_COLLECTION_EXCLUDE) != 0;
 		if (exclude ||
-		    ((layer->runtime_flag & VIEW_LAYER_HAS_HIDE) &&
-		     !(lc->runtime_flag & LAYER_COLLECTION_HAS_VISIBLE_OBJECTS)))
+		    ((lc->runtime_flag & LAYER_COLLECTION_VISIBLE) == 0))
 		{
 			ten->flag |= TE_DISABLED;
 		}



More information about the Bf-blender-cvs mailing list