[Bf-blender-cvs] [15ad01492e7] master: Cleanup: remove deprecated/unused preferences DNA

[Campbell Barton]

Commit: 15ad01492e71cc318db4a7d2f038f2c9959aa2ce
Author: Campbell Barton
Date:   Wed Feb 6 14:34:00 2019 +1100
Branches: master
https://developer.blender.org/rB15ad01492e71cc318db4a7d2f038f2c9959aa2ce

Cleanup: remove deprecated/unused preferences DNA

===================================================================

M	source/blender/makesdna/DNA_userdef_types.h
M	source/blender/makesrna/intern/rna_userdef.c

===================================================================

diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h
index 0627210a19b..c9ada7e3637 100644
--- a/source/blender/makesdna/DNA_userdef_types.h
+++ b/source/blender/makesdna/DNA_userdef_types.h
@@ -164,9 +164,6 @@ typedef struct ThemeUI {
 
 	uiWidgetStateColors wcol_state;
 
-	/** Deprecated, but we keep it for do_versions (2.66.1). */
-	uiPanelColors panel;
-
 	char widget_emboss[4];
 
 	/* fac: 0 - 1 for blend factor, width in pixels */
@@ -176,7 +173,6 @@ typedef struct ThemeUI {
 	char editor_outline[4];
 	short pad[1];
 
-	char iconfile[256];	// FILE_MAXFILE length
 	float icon_alpha;
 	float icon_saturation;
 	char _pad[4];
@@ -1003,7 +999,7 @@ typedef enum eText_Draw_Options {
 /** Grease Pencil Settings.
  * #UserDef.gp_settings */
 typedef enum eGP_UserdefSettings {
-	GP_PAINT_DOSMOOTH		    = (1 << 0),
+	// GP_PAINT_DOSMOOTH		    = (1 << 0),  /* UNUSED */
 	GP_PAINT_DOSIMPLIFY		    = (1 << 1),
 } eGP_UserdefSettings;
 
@@ -1047,16 +1043,6 @@ typedef enum eTimecodeStyles {
 	USER_TIMECODE_SUBRIP        = 100,
 } eTimecodeStyles;
 
-/* theme drawtypes */
-/* XXX: These are probably only for the old UI engine? */
-typedef enum eTheme_DrawTypes {
-	TH_MINIMAL  	= 0,
-	TH_ROUNDSHADED	= 1,
-	TH_ROUNDED  	= 2,
-	TH_OLDSKOOL 	= 3,
-	TH_SHADED   	= 4,
-} eTheme_DrawTypes;
-
 /** #UserDef.ndof_flag (3D mouse options) */
 typedef enum eNdof_Flag {
 	NDOF_SHOW_GUIDE     = (1 << 0),
diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c
index 2b06ae06dea..4063995bef3 100644
--- a/source/blender/makesrna/intern/rna_userdef.c
+++ b/source/blender/makesrna/intern/rna_userdef.c
@@ -1196,11 +1196,6 @@ static void rna_def_userdef_theme_ui(BlenderRNA *brna)
 	RNA_def_property_range(prop, 0.0f, 24.0f);
 	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
-	prop = RNA_def_property(srna, "icon_file", PROP_STRING, PROP_FILEPATH);
-	RNA_def_property_string_sdna(prop, NULL, "iconfile");
-	RNA_def_property_ui_text(prop, "Icon File", "");
-	RNA_def_property_update(prop, 0, "rna_userdef_update");
-
 	prop = RNA_def_property(srna, "icon_alpha", PROP_FLOAT, PROP_FACTOR);
 	RNA_def_property_ui_text(prop, "Icon Alpha", "Transparency of icons in the interface, to reduce contrast");
 	RNA_def_property_update(prop, 0, "rna_userdef_update");