From 95cc709612d3b2a78eea800cfcf62bf6f896b85d Mon Sep 17 00:00:00 2001
From: Jeroen Bakker <jbakker>
Date: Mon, 24 Aug 2020 15:19:33 +0200
Subject: [PATCH] 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
---
 release/datafiles/locale                                  | 2 +-
 release/datafiles/userdef/userdef_default_theme.c         | 1 -
 release/scripts/addons                                    | 2 +-
 release/scripts/presets/interface_theme/blender_light.xml | 1 -
 source/blender/editors/include/UI_resources.h             | 1 -
 source/blender/editors/interface/resources.c              | 3 ---
 source/blender/makesdna/DNA_userdef_types.h               | 4 +---
 source/blender/makesrna/intern/rna_userdef.c              | 6 ------
 source/tools                                              | 2 +-
 9 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/release/datafiles/locale b/release/datafiles/locale
index bc6623180ae..260b439d0fb 160000
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@ -1 +1 @@
-Subproject commit bc6623180aee561cba84ac11f5959b31016612ef
+Subproject commit 260b439d0fb15e3cd1efe5c120cf24f91d13d855
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
index 1bc96468a14..b47b6e554b8 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit 1bc96468a144750348ea6b134d4aaf457d7cc6cf
+Subproject commit b47b6e554b8b49344bb8fa90e70c7de49d53a000
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
index 44ae9d181c7..f4aa2de034d 160000
--- a/source/tools
+++ b/source/tools
@@ -1 +1 @@
-Subproject commit 44ae9d181c734c14ae22feb0d33ad39a626f8ce7
+Subproject commit f4aa2de034d359bf85c6a0f90c0d045c5858eb8d