Commit: d689dd777c83d70520d53848abb2072d37fcaab4
Author: Nathan Craddock
Date: Tue Aug 18 14:35:41 2020 -0600
Branches: soc-2020-outliner
https://developer.blender.org/rBd689dd777c83d70520d53848abb2072d37fcaab4
Merge branch 'master' into soc-2020-outliner
===================================================================
===================================================================
diff --cc source/blender/editors/space_outliner/outliner_draw.c
index 7128dee9aeb,1705b9dd606..0725c721315
--- a/source/blender/editors/space_outliner/outliner_draw.c
+++ b/source/blender/editors/space_outliner/outliner_draw.c
@@@ -2877,24 -2729,18 +2877,24 @@@ static void outliner_draw_iconrow_numbe
number_text,
text_col);
UI_fontstyle_set(fstyle);
- GPU_blend(true); /* Roundbox and text drawing disables. */
+ GPU_blend(GPU_BLEND_ALPHA); /* Roundbox and text drawing disables. */
}
-static void outliner_icon_background_colors(float icon_color[4], float
icon_border[4])
+static void outliner_draw_active_highlight(const float minx,
+ const float miny,
+ const float maxx,
+ const float maxy)
{
- float text[4];
- UI_GetThemeColor4fv(TH_TEXT, text);
+ const float ufac = U.pixelsize;
+ float icon_border[4];
+ UI_GetThemeColor4fv(TH_TEXT, icon_border);
+ icon_border[3] = 0.6f;
- copy_v3_v3(icon_color, text);
- icon_color[3] = 0.4f;
- copy_v3_v3(icon_border, text);
- icon_border[3] = 0.2f;
+ /* border around it */
+ UI_draw_roundbox_corner_set(UI_CNR_ALL);
+ UI_draw_roundbox_aa(
+ false, minx + ufac, miny + ufac, maxx - ufac, maxy - ufac, UI_UNIT_Y /
4.0f, icon_border);
+ GPU_blend(true); /* Roundbox disables. */
}
static void outliner_draw_iconrow_doit(uiBlock *block,
@@@ -3555,16 -3493,7 +3555,15 @@@ static void outliner_draw_tree(bContex
const uiFontStyle *fstyle = UI_FSTYLE_WIDGET;
int starty, startx;
+ /* Move the tree a unit left in view layer mode */
+ short mode_column_offset = (use_mode_column && (space_outliner->outlinevis
== SO_SCENES)) ?
+ UI_UNIT_X :
+ 0;
+ if (!use_mode_column && (space_outliner->outlinevis == SO_VIEW_LAYER)) {
+ mode_column_offset -= UI_UNIT_X;
+ }
+
- GPU_blend_set_func_separate(
- GPU_SRC_ALPHA, GPU_ONE_MINUS_SRC_ALPHA, GPU_ONE,
GPU_ONE_MINUS_SRC_ALPHA); /* Only once. */
+ GPU_blend(GPU_BLEND_ALPHA); /* Only once. */
if (space_outliner->outlinevis == SO_DATA_API) {
/* struct marks */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
