[Bf-blender-cvs] [38e569cb1fd] master: Cleanup: use UI_GetThemeColor3ubv when alpha is ignored
Campbell Barton
noreply at git.blender.org
Sat Feb 15 00:41:02 CET 2020
Commit: 38e569cb1fdcf75645344a487b53e3d514153a2f
Author: Campbell Barton
Date: Sat Feb 15 09:48:30 2020 +1100
Branches: master
https://developer.blender.org/rB38e569cb1fdcf75645344a487b53e3d514153a2f
Cleanup: use UI_GetThemeColor3ubv when alpha is ignored
===================================================================
M source/blender/draw/engines/overlay/overlay_extra.c
M source/blender/editors/space_outliner/outliner_draw.c
===================================================================
diff --git a/source/blender/draw/engines/overlay/overlay_extra.c b/source/blender/draw/engines/overlay/overlay_extra.c
index 354d206dd44..b40e95d538c 100644
--- a/source/blender/draw/engines/overlay/overlay_extra.c
+++ b/source/blender/draw/engines/overlay/overlay_extra.c
@@ -1350,7 +1350,7 @@ static void OVERLAY_gpencil_color_names(Object *ob)
int theme_id = DRW_object_wire_theme_get(ob, view_layer, NULL);
uchar color[4];
/* Color Management: Exception here as texts are drawn in sRGB space directly. */
- UI_GetThemeColor4ubv(theme_id, color);
+ UI_GetThemeColor3ubv(theme_id, color);
color[3] = 255;
struct DRWTextStore *dt = DRW_text_cache_ensure();
diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c
index 12704777b05..cc1222aa47b 100644
--- a/source/blender/editors/space_outliner/outliner_draw.c
+++ b/source/blender/editors/space_outliner/outliner_draw.c
@@ -2703,7 +2703,7 @@ static void outliner_draw_iconrow_number(const uiFontStyle *fstyle,
/* Now the numbers. */
uchar text_col[4];
- UI_GetThemeColor4ubv(TH_TEXT_HI, text_col);
+ UI_GetThemeColor3ubv(TH_TEXT_HI, text_col);
text_col[3] = 255;
uiFontStyle fstyle_small = *fstyle;
More information about the Bf-blender-cvs
mailing list