[Bf-blender-cvs] [b271cbfcb06] master: Cleanup: unused DNA struct members

Campbell Barton noreply at git.blender.org
Wed Feb 13 09:15:18 CET 2019


Commit: b271cbfcb062498532a2bde5ab9fbac03be8f1cd
Author: Campbell Barton
Date:   Wed Feb 13 19:12:43 2019 +1100
Branches: master
https://developer.blender.org/rBb271cbfcb062498532a2bde5ab9fbac03be8f1cd

Cleanup: unused DNA struct members

- Timeline theme.
- 3D view runtime variables.
- Exclude EditLatt from SDNA.

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

M	release/datafiles/userdef/userdef_default_theme.c
M	source/blender/makesdna/DNA_lattice_types.h
M	source/blender/makesdna/DNA_space_types.h
M	source/blender/makesdna/DNA_userdef_types.h
M	source/blender/makesdna/DNA_view3d_types.h

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

diff --git a/release/datafiles/userdef/userdef_default_theme.c b/release/datafiles/userdef/userdef_default_theme.c
index 9c195fef202..b6ab5ff8375 100644
--- a/release/datafiles/userdef/userdef_default_theme.c
+++ b/release/datafiles/userdef/userdef_default_theme.c
@@ -742,11 +742,6 @@ const bTheme U_theme_default = {
 		.match = RGBA(0x337f334c),
 		.selected_highlight = RGBA(0x314e784c),
 	},
-	.ttime = {
-		.vertex_size = 3,
-		.outline_width = 1,
-		.facedot_size = 4,
-	},
 	.tnode = {
 		.back = RGBA(0x23232300),
 		.title = RGBA(0xeeeeeeff),
diff --git a/source/blender/makesdna/DNA_lattice_types.h b/source/blender/makesdna/DNA_lattice_types.h
index dad46dbe428..0794e297ed1 100644
--- a/source/blender/makesdna/DNA_lattice_types.h
+++ b/source/blender/makesdna/DNA_lattice_types.h
@@ -32,12 +32,12 @@ struct Ipo;
 struct Key;
 struct MDeformVert;
 
+#
+#
 typedef struct EditLatt {
 	struct Lattice *latt;
 
 	int shapenr;
-
-	char pad[4];
 } EditLatt;
 
 typedef struct Lattice {
diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h
index 24526ed123d..b571140eb94 100644
--- a/source/blender/makesdna/DNA_space_types.h
+++ b/source/blender/makesdna/DNA_space_types.h
@@ -134,9 +134,8 @@ typedef struct SpaceButs {
 	short mainb, mainbo, mainbuser;
 	/** Preview is signal to refresh. */
 	short preview;
-	short pad[2];
+	char _pad[5];
 	char flag;
-	char collection_context;
 
 	/** Runtime. */
 	void *path;
diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h
index b1d4145328b..cfb52c8fa14 100644
--- a/source/blender/makesdna/DNA_userdef_types.h
+++ b/source/blender/makesdna/DNA_userdef_types.h
@@ -434,7 +434,6 @@ typedef struct bTheme {
 	ThemeSpace tima;
 	ThemeSpace text;
 	ThemeSpace toops;
-	ThemeSpace ttime;
 	ThemeSpace tnode;
 	ThemeSpace tuserpref;
 	ThemeSpace tconsole;
diff --git a/source/blender/makesdna/DNA_view3d_types.h b/source/blender/makesdna/DNA_view3d_types.h
index f8d207cbe34..633a9dd07b5 100644
--- a/source/blender/makesdna/DNA_view3d_types.h
+++ b/source/blender/makesdna/DNA_view3d_types.h
@@ -243,12 +243,10 @@ typedef struct View3D {
 	float bundle_size;
 	/** Display style for bundle. */
 	char bundle_drawtype;
-	char pad[3];
+	char _pad3[2];
 
-	/** For active layer toggle. */
-	unsigned int lay_prev DNA_DEPRECATED;
-	/** Used while drawing. */
-	unsigned int lay_used DNA_DEPRECATED;
+	/** Multiview current eye - for internal use. */
+	char multiview_eye;
 
 	int object_type_exclude_viewport;
 	int object_type_exclude_select;
@@ -290,17 +288,8 @@ typedef struct View3D {
 	short gridsubdiv;
 	char gridflag;
 
-	/* transform gizmo info */
-	char _pad5[2], gizmo_flag;
-
-	short _pad2;
-
-	/* drawflags, denoting state */
-	char _pad3;
-	char transp, xray;
-
-	/** Multiview current eye - for internal use. */
-	char multiview_eye;
+	/** Transform gizmo info. */
+	char gizmo_flag;
 
 	/* actually only used to define the opacity of the grease pencil vertex in edit mode */
 	float vertex_opacity;



More information about the Bf-blender-cvs mailing list