Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan Craddock <nzcraddock@gmail.com>2020-07-04 20:48:37 +0300
committerNathan Craddock <nzcraddock@gmail.com>2020-07-04 20:48:37 +0300
commit561bd0ebaca635561751bf564774675f2736dd78 (patch)
treef2973b46fc28d95c876b982d01c262d387de4644 /source/blender/editors/space_outliner/outliner_draw.c
parent4ac06b97ee10bba83130595661880e6a3df0496f (diff)
Collection Colors: Fill behind
It is easy to switch with the #if blocks now.
Diffstat (limited to 'source/blender/editors/space_outliner/outliner_draw.c')
-rw-r--r--source/blender/editors/space_outliner/outliner_draw.c6
1 files changed, 5 insertions, 1 deletions
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);