[Bf-blender-cvs] [1cba89572f7] temp-ui-tweaks: UI: Use Outline color of menu item for separator
Pablo Vazquez
noreply at git.blender.org
Tue Aug 24 03:07:07 CEST 2021
Commit: 1cba89572f789d6e61cb779c226c69661b9484d8
Author: Pablo Vazquez
Date: Tue Aug 24 02:46:43 2021 +0200
Branches: temp-ui-tweaks
https://developer.blender.org/rB1cba89572f789d6e61cb779c226c69661b9484d8
UI: Use Outline color of menu item for separator
Instead of forcing a transparent shadeof the text color.
===================================================================
M source/blender/editors/interface/interface_widgets.c
===================================================================
diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c
index 2d223b4d032..3194764415b 100644
--- a/source/blender/editors/interface/interface_widgets.c
+++ b/source/blender/editors/interface/interface_widgets.c
@@ -3358,19 +3358,12 @@ static void ui_draw_but_HSV_v(uiBut *but, const rcti *rect)
static void ui_draw_separator(const rcti *rect, const uiWidgetColors *wcol)
{
const int y = rect->ymin + BLI_rcti_size_y(rect) / 2 - 1;
- const uchar col[4] = {
- wcol->text[0],
- wcol->text[1],
- wcol->text[2],
- 30,
- };
-
+ const uchar col[3] = {wcol->outline[0], wcol->outline[1], wcol->outline[2]};
const uint pos = GPU_vertformat_attr_add(
immVertexFormat(), "pos", GPU_COMP_F32, 2, GPU_FETCH_FLOAT);
immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
- GPU_blend(GPU_BLEND_ALPHA);
- immUniformColor4ubv(col);
+ immUniformColor3ubv(col);
GPU_line_width(1.0f);
immBegin(GPU_PRIM_LINES, 2);
@@ -3378,8 +3371,6 @@ static void ui_draw_separator(const rcti *rect, const uiWidgetColors *wcol)
immVertex2f(pos, rect->xmax, y);
immEnd();
- GPU_blend(GPU_BLEND_NONE);
-
immUnbindProgram();
}
More information about the Bf-blender-cvs
mailing list