blender
/
blender
136
406
Fork 589
Code Issues 6.2k Pull Requests 757 Projects 19 Wiki Activity

Theme: Remove TH_UV_OTHERS from bTheme 

`TH_UV_OTHERS` is a theme option that isn't hooked to anything since
blender 2.80. This patch will remove the option and related code.

Reviewed By: Campbell Barton

Differential Revision: https://developer.blender.org/D8669
This commit is contained in:
Jeroen Bakker 2020-08-24 15:19:33 +02:00 committed by Jeroen Bakker
parent 1cac6fe542
commit 95cc709612
9 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
release/datafiles/locale

@ -1 +1 @@
Subproject commit bc6623180aee561cba84ac11f5959b31016612ef
Subproject commit 260b439d0fb15e3cd1efe5c120cf24f91d13d855

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

@ -710,7 +710,6 @@ const bTheme U_theme_default = {
.preview_stitch_unstitchable = RGBA(0xff0000ff),
.preview_stitch_active = RGBA(0xe1d2c323),
.uv_shadow = RGBA(0x707070ff),
.uv_others = RGBA(0x606060ff),
.paint_curve_pivot = RGBA(0xff7f7f7f),
.paint_curve_handle = RGBA(0x7fff7f7f),
.metadatatext = RGBA(0xffffffff),

2
release/scripts/addons

@ -1 +1 @@
Subproject commit 1bc96468a144750348ea6b134d4aaf457d7cc6cf
Subproject commit b47b6e554b8b49344bb8fa90e70c7de49d53a000

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

@ -735,7 +735,6 @@
preview_stitch_unstitchable="#ff0000ff"
preview_stitch_active="#e1d2c323"
uv_shadow="#707070ff"
uv_others="#606060ff"
frame_current="#5680c2"
metadatabg="#000000"
metadatatext="#ffffff"

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

@ -262,7 +262,6 @@ typedef enum ThemeColorID {
TH_PAINT_CURVE_PIVOT,
TH_UV_SHADOW,
TH_UV_OTHERS,
TH_FREESTYLE_EDGE_MARK,
TH_FREESTYLE_FACE_MARK,

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

@ -774,9 +774,6 @@ const uchar *UI_ThemeGetColorPtr(bTheme *btheme, int spacetype, int colorid)
cp = ts->metadatatext;
break;
case TH_UV_OTHERS:
cp = ts->uv_others;
break;
case TH_UV_SHADOW:
cp = ts->uv_shadow;
break;

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

@ -327,7 +327,7 @@ typedef struct ThemeSpace {
unsigned char syntaxd[4], syntaxr[4]; // in nodespace used for distort
unsigned char line_numbers[4];
char _pad6[7];
char _pad6[3];
unsigned char nodeclass_output[4], nodeclass_filter[4];
unsigned char nodeclass_vector[4], nodeclass_texture[4];
@ -372,8 +372,6 @@ typedef struct ThemeSpace {
/** Two uses, for uvs with modifier applied on mesh and uvs during painting. */
unsigned char uv_shadow[4];
/** Uvs of other objects. */
unsigned char uv_others[4];
/** Outliner - filter match. */
unsigned char match[4];

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

@ -3039,12 +3039,6 @@ static void rna_def_userdef_theme_space_image(BlenderRNA *brna)
RNA_def_property_ui_text(prop, "Texture paint/Modifier UVs", "");
RNA_def_property_update(prop, 0, "rna_userdef_theme_update");
prop = RNA_def_property(srna, "uv_others", PROP_FLOAT, PROP_COLOR_GAMMA);
RNA_def_property_float_sdna(prop, NULL, "uv_others");
RNA_def_property_array(prop, 4);
RNA_def_property_ui_text(prop, "Other Object UVs", "");
RNA_def_property_update(prop, 0, "rna_userdef_theme_update");
prop = RNA_def_property(srna, "frame_current", PROP_FLOAT, PROP_COLOR_GAMMA);
RNA_def_property_float_sdna(prop, NULL, "cframe");
RNA_def_property_array(prop, 3);

2
source/tools

@ -1 +1 @@
Subproject commit 44ae9d181c734c14ae22feb0d33ad39a626f8ce7
Subproject commit f4aa2de034d359bf85c6a0f90c0d045c5858eb8d