diff options
author | Hans Goudey <h.goudey@me.com> | 2020-06-02 22:59:37 +0300 |
---|---|---|
committer | Hans Goudey <h.goudey@me.com> | 2020-06-02 22:59:37 +0300 |
commit | ea92f8207a99d916aef509272eca804b5136c830 (patch) | |
tree | d45cd3619e32af659a3cdc16fa2d3dc31bfac0ef /source/blender/editors | |
parent | e391b3e0fb46c760d3dad3ba65a299e948a2423a (diff) |
Revert "UI: Fix T77173: Report Background Colors for 2.83 Release"
This reverts commit 7fc0053c27e5e9ba3cc946898c7c11a8545f2777.
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/include/UI_resources.h | 3 | ||||
-rw-r--r-- | source/blender/editors/interface/resources.c | 9 | ||||
-rw-r--r-- | source/blender/editors/space_info/info_ops.c | 6 |
3 files changed, 3 insertions, 15 deletions
diff --git a/source/blender/editors/include/UI_resources.h b/source/blender/editors/include/UI_resources.h index 79e1ac63641..c5c4ca79f14 100644 --- a/source/blender/editors/include/UI_resources.h +++ b/source/blender/editors/include/UI_resources.h @@ -340,9 +340,6 @@ typedef enum ThemeColorID { TH_INFO_OPERATOR, TH_INFO_OPERATOR_TEXT, TH_VIEW_OVERLAY, - TH_INFO_REPORT_ERROR, - TH_INFO_REPORT_WARNING, - TH_INFO_REPORT_INFO, TH_V3D_CLIPPING_BORDER, diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c index ac7d8783123..01c9716ec86 100644 --- a/source/blender/editors/interface/resources.c +++ b/source/blender/editors/interface/resources.c @@ -1013,15 +1013,6 @@ const uchar *UI_ThemeGetColorPtr(bTheme *btheme, int spacetype, int colorid) case TH_INFO_OPERATOR_TEXT: cp = ts->info_operator_text; break; - case TH_INFO_REPORT_ERROR: - cp = ts->info_report_error; - break; - case TH_INFO_REPORT_WARNING: - cp = ts->info_report_warning; - break; - case TH_INFO_REPORT_INFO: - cp = ts->info_report_info; - break; case TH_V3D_CLIPPING_BORDER: cp = ts->clipping_border_3d; break; diff --git a/source/blender/editors/space_info/info_ops.c b/source/blender/editors/space_info/info_ops.c index 2e639879447..30f36509b41 100644 --- a/source/blender/editors/space_info/info_ops.c +++ b/source/blender/editors/space_info/info_ops.c @@ -568,13 +568,13 @@ static int update_reports_display_invoke(bContext *C, wmOperator *UNUSED(op), co /* set target color based on report type */ if (report->type & RPT_ERROR_ALL) { - UI_GetThemeColorType3fv(TH_INFO_REPORT_ERROR, SPACE_INFO, target_col); + UI_GetThemeColorType3fv(TH_INFO_ERROR, SPACE_INFO, target_col); } else if (report->type & RPT_WARNING_ALL) { - UI_GetThemeColorType3fv(TH_INFO_REPORT_WARNING, SPACE_INFO, target_col); + UI_GetThemeColorType3fv(TH_INFO_WARNING, SPACE_INFO, target_col); } else if (report->type & RPT_INFO_ALL) { - UI_GetThemeColorType3fv(TH_INFO_REPORT_INFO, SPACE_INFO, target_col); + UI_GetThemeColorType3fv(TH_INFO_INFO, SPACE_INFO, target_col); } target_col[3] = 0.65f; |