Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorJeroen Bakker <jbakker>2020-08-24 16:19:33 +0300
committerJeroen Bakker <jeroen@blender.org>2020-08-24 16:19:49 +0300
commit95cc709612d3b2a78eea800cfcf62bf6f896b85d (patch)
tree5a1044cce25f2394a503d7d8184603984476cf15 /source
parent1cac6fe542d92c6df04c420f432bb64627095221 (diff)
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
Diffstat (limited to 'source')
-rw-r--r--source/blender/editors/include/UI_resources.h1
-rw-r--r--source/blender/editors/interface/resources.c3
-rw-r--r--source/blender/makesdna/DNA_userdef_types.h4
-rw-r--r--source/blender/makesrna/intern/rna_userdef.c6
m---------source/tools0
5 files changed, 1 insertions, 13 deletions
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