blender
/
blender
134
398
Fork 580
Code Issues 6.3k Pull Requests 755 Projects 19 Wiki Activity

Merge branch 'blender-v2.83-release'

This commit is contained in:
Hans Goudey 2020-06-02 15:58:38 -04:00
parent a87eee65fc 7fc0053c27
commit e391b3e0fb
8 changed files with 44 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
release/datafiles/userdef/userdef_default_theme.c
View File

@ -496,6 +496,9 @@ 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),

3
release/scripts/presets/interface_theme/blender_light.xml
View File

@ -1052,6 +1052,9 @@
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

6
source/blender/blenloader/intern/versioning_userdef.c
View File

@ -216,6 +216,12 @@ 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.
*

3
source/blender/editors/include/UI_resources.h
View File

@ -340,6 +340,9 @@ 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,

9
source/blender/editors/interface/resources.c
View File

@ -1013,6 +1013,15 @@ 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;

6
source/blender/editors/space_info/info_ops.c
View File

@ -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_ERROR, SPACE_INFO, target_col);
UI_GetThemeColorType3fv(TH_INFO_REPORT_ERROR, SPACE_INFO, target_col);
}
else if (report->type & RPT_WARNING_ALL) {
UI_GetThemeColorType3fv(TH_INFO_WARNING, SPACE_INFO, target_col);
UI_GetThemeColorType3fv(TH_INFO_REPORT_WARNING, SPACE_INFO, target_col);
}
else if (report->type & RPT_INFO_ALL) {
UI_GetThemeColorType3fv(TH_INFO_INFO, SPACE_INFO, target_col);
UI_GetThemeColorType3fv(TH_INFO_REPORT_INFO, SPACE_INFO, target_col);
}
target_col[3] = 0.65f;

2
source/blender/makesdna/DNA_userdef_types.h
View File

@ -422,6 +422,8 @@ 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];

15
source/blender/makesrna/intern/rna_userdef.c
View File

@ -2669,6 +2669,21 @@ 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)