diff options
| m--------- | release/datafiles/locale | 0 | ||||
| -rw-r--r-- | release/datafiles/userdef/userdef_default_theme.c | 1 | ||||
| m--------- | release/scripts/addons | 0 | ||||
| -rw-r--r-- | release/scripts/presets/interface_theme/blender_light.xml | 1 | ||||
| -rw-r--r-- | source/blender/editors/include/UI_resources.h | 1 | ||||
| -rw-r--r-- | source/blender/editors/interface/resources.c | 3 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_userdef_types.h | 4 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_userdef.c | 6 | ||||
| m--------- | source/tools | 0 |
9 files changed, 1 insertions, 15 deletions
diff --git a/release/datafiles/locale b/release/datafiles/locale -Subproject bc6623180aee561cba84ac11f5959b31016612e +Subproject 260b439d0fb15e3cd1efe5c120cf24f91d13d85 diff --git a/release/datafiles/userdef/userdef_default_theme.c b/release/datafiles/userdef/userdef_default_theme.c index 4d48bb8eaac..64721a4c4e2 100644 --- a/release/datafiles/userdef/userdef_default_theme.c +++ b/release/datafiles/userdef/userdef_default_theme.c @@ -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), diff --git a/release/scripts/addons b/release/scripts/addons -Subproject 1bc96468a144750348ea6b134d4aaf457d7cc6c +Subproject b47b6e554b8b49344bb8fa90e70c7de49d53a00 diff --git a/release/scripts/presets/interface_theme/blender_light.xml b/release/scripts/presets/interface_theme/blender_light.xml index 48ad0a8367e..6a5430c6ad1 100644 --- a/release/scripts/presets/interface_theme/blender_light.xml +++ b/release/scripts/presets/interface_theme/blender_light.xml @@ -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" diff --git a/source/blender/editors/include/UI_resources.h b/source/blender/editors/include/UI_resources.h index 5e3c8feb333..31cb62117c5 100644 --- a/source/blender/editors/include/UI_resources.h +++ b/source/blender/editors/include/UI_resources.h @@ -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, diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c index 4c2b71514a4..87474369e8d 100644 --- a/source/blender/editors/interface/resources.c +++ b/source/blender/editors/interface/resources.c @@ -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; diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h index 136fe3744ef..ec46d2680ca 100644 --- a/source/blender/makesdna/DNA_userdef_types.h +++ b/source/blender/makesdna/DNA_userdef_types.h @@ -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]; diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c index 90873fa73f4..2cee99cd372 100644 --- a/source/blender/makesrna/intern/rna_userdef.c +++ b/source/blender/makesrna/intern/rna_userdef.c @@ -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); diff --git a/source/tools b/source/tools -Subproject 44ae9d181c734c14ae22feb0d33ad39a626f8ce +Subproject f4aa2de034d359bf85c6a0f90c0d045c5858eb8 |