UI: panel tabs, use simple color interpolation that ignores alpha

1 files changed, 16 insertions, 16 deletions

diff --git a/source/blender/editors/interface/interface_panel.c b/source/blender/editors/interface/interface_panel.c
index 362df8b3d12..1c6ea14b60b 100644
--- a/source/blender/editors/interface/interface_panel.c
+++ b/source/blender/editors/interface/interface_panel.c
@@ -1419,34 +1419,34 @@ void UI_panel_category_draw_all(ARegion *ar, const char *category_id_active)
 
 	/* Primary theme colors */
 	unsigned char theme_col_back[4];
-	unsigned char theme_col_text[4];
-	unsigned char theme_col_text_hi[4];
+	unsigned char theme_col_text[3];
+	unsigned char theme_col_text_hi[3];
 
 	/* Tab colors */
 	unsigned char theme_col_tab_bg[4];
-	unsigned char theme_col_tab_active[4];
-	unsigned char theme_col_tab_inactive[4];
+	unsigned char theme_col_tab_active[3];
+	unsigned char theme_col_tab_inactive[3];
 
 	/* Secondary theme colors */
-	unsigned char theme_col_tab_outline[4];
-	unsigned char theme_col_tab_divider[4];  /* line that divides tabs from the main area */
-	unsigned char theme_col_tab_highlight[4];
-	unsigned char theme_col_tab_highlight_inactive[4];
+	unsigned char theme_col_tab_outline[3];
+	unsigned char theme_col_tab_divider[3];  /* line that divides tabs from the main area */
+	unsigned char theme_col_tab_highlight[3];
+	unsigned char theme_col_tab_highlight_inactive[3];
 
 
 
 	UI_GetThemeColor4ubv(TH_BACK, theme_col_back);
-	UI_GetThemeColor4ubv(TH_TEXT, theme_col_text);
-	UI_GetThemeColor4ubv(TH_TEXT_HI, theme_col_text_hi);
+	UI_GetThemeColor3ubv(TH_TEXT, theme_col_text);
+	UI_GetThemeColor3ubv(TH_TEXT_HI, theme_col_text_hi);
 
 	UI_GetThemeColor4ubv(TH_TAB_BACK, theme_col_tab_bg);
-	UI_GetThemeColor4ubv(TH_TAB_ACTIVE, theme_col_tab_active);
-	UI_GetThemeColor4ubv(TH_TAB_INACTIVE, theme_col_tab_inactive);
-	UI_GetThemeColor4ubv(TH_TAB_OUTLINE, theme_col_tab_outline);
+	UI_GetThemeColor3ubv(TH_TAB_ACTIVE, theme_col_tab_active);
+	UI_GetThemeColor3ubv(TH_TAB_INACTIVE, theme_col_tab_inactive);
+	UI_GetThemeColor3ubv(TH_TAB_OUTLINE, theme_col_tab_outline);
 
-	blend_color_interpolate_byte(theme_col_tab_divider, theme_col_back, theme_col_tab_outline, 0.3f);
-	blend_color_interpolate_byte(theme_col_tab_highlight, theme_col_back, theme_col_text_hi, 0.2f);
-	blend_color_interpolate_byte(theme_col_tab_highlight_inactive, theme_col_tab_inactive, theme_col_text_hi, 0.12f);
+	interp_v3_v3v3_uchar(theme_col_tab_divider, theme_col_back, theme_col_tab_outline, 0.3f);
+	interp_v3_v3v3_uchar(theme_col_tab_highlight, theme_col_back, theme_col_text_hi, 0.2f);
+	interp_v3_v3v3_uchar(theme_col_tab_highlight_inactive, theme_col_tab_inactive, theme_col_text_hi, 0.12f);
 
 	is_alpha = (ar->overlap && (theme_col_back[3] != 255));