[Bf-blender-cvs] [ea92f8207a9] master: Revert "UI: Fix T77173: Report Background Colors for 2.83 Release"
Hans Goudey
noreply at git.blender.org
Tue Jun 2 22:02:31 CEST 2020
Commit: ea92f8207a99d916aef509272eca804b5136c830
Author: Hans Goudey
Date: Tue Jun 2 15:59:37 2020 -0400
Branches: master
https://developer.blender.org/rBea92f8207a99d916aef509272eca804b5136c830
Revert "UI: Fix T77173: Report Background Colors for 2.83 Release"
This reverts commit 7fc0053c27e5e9ba3cc946898c7c11a8545f2777.
===================================================================
M release/datafiles/userdef/userdef_default_theme.c
M release/scripts/presets/interface_theme/blender_light.xml
M source/blender/blenloader/intern/versioning_userdef.c
M source/blender/editors/include/UI_resources.h
M source/blender/editors/interface/resources.c
M source/blender/editors/space_info/info_ops.c
M source/blender/makesdna/DNA_userdef_types.h
M source/blender/makesrna/intern/rna_userdef.c
===================================================================
diff --git a/release/datafiles/userdef/userdef_default_theme.c b/release/datafiles/userdef/userdef_default_theme.c
index 5d5bcf9f7e3..4d48bb8eaac 100644
--- a/release/datafiles/userdef/userdef_default_theme.c
+++ b/release/datafiles/userdef/userdef_default_theme.c
@@ -496,9 +496,6 @@ const bTheme U_theme_default = {
.info_property_text = RGBA(0xffffffff),
.info_operator = RGBA(0x3ace87ff),
.info_operator_text = RGBA(0xffffffff),
- .info_report_error = RGBA(0x990000ff),
- .info_report_warning = RGBA(0xb36a00ff),
- .info_report_info = RGBA(0x1d4383ff),
},
.space_action = {
.back = RGBA(0x42424200),
diff --git a/release/scripts/presets/interface_theme/blender_light.xml b/release/scripts/presets/interface_theme/blender_light.xml
index 10542a88a5f..48ad0a8367e 100644
--- a/release/scripts/presets/interface_theme/blender_light.xml
+++ b/release/scripts/presets/interface_theme/blender_light.xml
@@ -1052,9 +1052,6 @@
info_property_text="#ffffff"
info_operator="#3ace87ff"
info_operator_text="#ffffff"
- info_report_error="#990000"
- info_report_warning="#b36a00"
- info_report_info="#6080ff"
>
<space>
<ThemeSpaceGeneric
diff --git a/source/blender/blenloader/intern/versioning_userdef.c b/source/blender/blenloader/intern/versioning_userdef.c
index 3774811c75e..1b0e41ec54a 100644
--- a/source/blender/blenloader/intern/versioning_userdef.c
+++ b/source/blender/blenloader/intern/versioning_userdef.c
@@ -216,12 +216,6 @@ static void do_versions_theme(const UserDef *userdef, bTheme *btheme)
btheme->tui.transparent_checker_size = U_theme_default.tui.transparent_checker_size;
}
- if (!USER_VERSION_ATLEAST(283, 18)) {
- FROM_DEFAULT_V4_UCHAR(space_info.info_report_error);
- FROM_DEFAULT_V4_UCHAR(space_info.info_report_warning);
- FROM_DEFAULT_V4_UCHAR(space_info.info_report_info);
- }
-
/**
* Versioning code until next subversion bump goes here.
*
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;
diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h
index 31063791cd8..019e4c9ea9e 100644
--- a/source/blender/makesdna/DNA_userdef_types.h
+++ b/source/blender/makesdna/DNA_userdef_types.h
@@ -422,8 +422,6 @@ typedef struct ThemeSpace {
unsigned char info_debug[4], info_debug_text[4];
unsigned char info_property[4], info_property_text[4];
unsigned char info_operator[4], info_operator_text[4];
- unsigned char info_report_error[4], info_report_warning[4], info_report_info[4];
- char _pad[4];
unsigned char paint_curve_pivot[4];
unsigned char paint_curve_handle[4];
diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c
index 0332e5a60f7..49a0121dadb 100644
--- a/source/blender/makesrna/intern/rna_userdef.c
+++ b/source/blender/makesrna/intern/rna_userdef.c
@@ -2669,21 +2669,6 @@ static void rna_def_userdef_theme_space_info(BlenderRNA *brna)
RNA_def_property_array(prop, 3);
RNA_def_property_ui_text(prop, "Operator Icon Foreground", "Foreground color of Operator icon");
RNA_def_property_update(prop, 0, "rna_userdef_theme_update");
-
- prop = RNA_def_property(srna, "info_report_error", PROP_FLOAT, PROP_COLOR_GAMMA);
- RNA_def_property_array(prop, 3);
- RNA_def_property_ui_text(prop, "Error Banner Background", "");
- RNA_def_property_update(prop, 0, "rna_userdef_theme_update");
-
- prop = RNA_def_property(srna, "info_report_warning", PROP_FLOAT, PROP_COLOR_GAMMA);
- RNA_def_property_array(prop, 3);
- RNA_def_property_ui_text(prop, "Warning Banner Background", "");
- RNA_def_property_update(prop, 0, "rna_userdef_theme_update");
-
- prop = RNA_def_property(srna, "info_report_info", PROP_FLOAT, PROP_COLOR_GAMMA);
- RNA_def_property_array(prop, 3);
- RNA_def_property_ui_text(prop, "Info Banner Background", "");
- RNA_def_property_update(prop, 0, "rna_userdef_theme_update");
}
static void rna_def_userdef_theme_space_text(BlenderRNA *brna)
More information about the Bf-blender-cvs
mailing list