diff --git a/release/datafiles/alert_icons.png b/release/datafiles/alert_icons.png index 5b6385b2325..c73277af99b 100644 Binary files a/release/datafiles/alert_icons.png and b/release/datafiles/alert_icons.png differ diff --git a/release/datafiles/alert_icons.svg b/release/datafiles/alert_icons.svg index 0f30b4ad47b..1e4aefd8b4e 100644 --- a/release/datafiles/alert_icons.svg +++ b/release/datafiles/alert_icons.svg @@ -1,185 +1,46 @@ - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - + + + + - - diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c index e2e19e9fcd4..83e47ce9f07 100644 --- a/source/blender/editors/interface/interface.c +++ b/source/blender/editors/interface/interface.c @@ -4706,23 +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); - - if (icon == ALERT_ICON_BLENDER) { - return uiDefButImage(block, ibuf, x, y, width, height, NULL); - } - uchar icon_color[4]; - ThemeColorID color_id = TH_INFO_WARNING; - if (icon == ALERT_ICON_ERROR) { - color_id = TH_INFO_ERROR; - } - else if (icon == ALERT_ICON_INFO) { - color_id = TH_INFO_INFO; - } - else if (icon == ALERT_ICON_QUESTION) { - color_id = TH_INFO_PROPERTY; - } - UI_GetThemeColorType4ubv(color_id, SPACE_INFO, icon_color); + UI_GetThemeColor4ubv(TH_TEXT, icon_color); return uiDefButImage(block, ibuf, x, y, width, height, icon_color); } diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c index 23571395e24..ffafa1e5c0c 100644 --- a/source/blender/windowmanager/intern/wm_files.c +++ b/source/blender/windowmanager/intern/wm_files.c @@ -3172,7 +3172,7 @@ static uiBlock *block_create__close_file_dialog(struct bContext *C, /* Alert Icon. */ uiLayout *layout = uiLayoutColumn(split_block, false); - uiDefButAlert(block, ALERT_ICON_WARNING, 0, 0, 0, icon_size); + uiDefButAlert(block, ALERT_ICON_QUESTION, 0, 0, 0, icon_size); /* The rest of the content on the right. */ layout = uiLayoutColumn(split_block, false);