[Bf-blender-cvs] [561bd0ebaca] soc-2020-outliner: Collection Colors: Fill behind

[Nathan Craddock]

Commit: 561bd0ebaca635561751bf564774675f2736dd78
Author: Nathan Craddock
Date:   Sat Jul 4 11:48:37 2020 -0600
Branches: soc-2020-outliner
https://developer.blender.org/rB561bd0ebaca635561751bf564774675f2736dd78

Collection Colors: Fill behind

It is easy to switch with the #if blocks now.

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

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

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

diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c
index 4378afcca54..2abdd3aee1f 100644
--- a/source/blender/editors/space_outliner/outliner_draw.c
+++ b/source/blender/editors/space_outliner/outliner_draw.c
@@ -2783,6 +2783,7 @@ static void tselem_draw_icon(uiBlock *block,
     return;
   }
 
+#if 0
   if (outliner_is_collection_tree_element(te)) {
     Collection *collection = outliner_collection_from_tree_element(te);
 
@@ -2810,6 +2811,9 @@ static void tselem_draw_icon(uiBlock *block,
   }
   /* Icon is covered by restrict buttons */
   else if (!is_clickable || x >= xmax) {
+#endif /* if 0 */
+
+  if (!is_clickable || x >= xmax) {
     /* Reduce alpha to match icon buttons */
     alpha *= 0.8f;
 
@@ -3232,7 +3236,7 @@ static void outliner_draw_tree_element(bContext *C,
       te->flag |= TE_ACTIVE; /* For lookup in display hierarchies. */
     }
 
-#if 0
+#if 1
     /* Collection colors. */
     if (outliner_is_collection_tree_element(te)) {
       Collection *collection = outliner_collection_from_tree_element(te);