[Bf-blender-cvs] [9fe58175885] master: UI: Monochrome Alert Icons not changing color until theme refresh

Harley Acheson noreply at git.blender.org
Tue Oct 13 18:43:46 CEST 2020


Commit: 9fe581758851c98a8e43f0e8a02d70551352682d
Author: Harley Acheson
Date:   Tue Oct 13 09:35:46 2020 -0700
Branches: master
https://developer.blender.org/rB9fe581758851c98a8e43f0e8a02d70551352682d

UI: Monochrome Alert Icons not changing color until theme refresh

Changing the color of monochrome alert icons would not change until the theme was reloaded.

Differential Revision: https://developer.blender.org/D9062

Reviewed by Harley Acheson

===================================================================

M	source/blender/editors/interface/interface.c

===================================================================

diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c
index 83e47ce9f07..94b93c11f6c 100644
--- a/source/blender/editors/interface/interface.c
+++ b/source/blender/editors/interface/interface.c
@@ -4706,9 +4706,8 @@ uiBut *uiDefButImage(
 uiBut *uiDefButAlert(uiBlock *block, int icon, int x, int y, short width, short height)
 {
   struct ImBuf *ibuf = UI_icon_alert_imbuf_get(icon);
-  uchar icon_color[4];
-  UI_GetThemeColor4ubv(TH_TEXT, icon_color);
-  return uiDefButImage(block, ibuf, x, y, width, height, icon_color);
+  bTheme *btheme = UI_GetTheme();
+  return uiDefButImage(block, ibuf, x, y, width, height, btheme->tui.wcol_menu_back.text);
 }
 
 /**



More information about the Bf-blender-cvs mailing list