Cleanup: use '_pad' convention for padding in all DNA structs

Avoids mixing these in with regular variables in code-completion.

Use char for pad members except for 'void *', to make size clearer.

Removed/shrink a few redundant padding vars which were >= 8 bytes.

1 files changed, 31 insertions, 25 deletions

diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h
index efa1c0e5010..405b2b92d8c 100644
--- a/source/blender/makesdna/DNA_space_types.h
+++ b/source/blender/makesdna/DNA_space_types.h
@@ -97,7 +97,7 @@ typedef struct SpaceInfo {
 	/* End 'SpaceLink' header. */
 
 	char rpt_mask;
-	char pad[7];
+	char _pad[7];
 } SpaceInfo;
 
 /* SpaceInfo.rpt_mask */
@@ -248,7 +248,7 @@ typedef struct SpaceOutliner {
 	short flag, outlinevis, storeflag, search_flags;
 	int filter;
 	char filter_state;
-	char pad;
+	char _pad;
 	short filter_id_type;
 
 	/**
@@ -401,7 +401,7 @@ typedef struct SpaceGraph {
 	float cursorVal;
 	/** Pivot point for transforms. */
 	int around;
-	int pad;
+	char _pad[4];
 
 	SpaceGraph_Runtime runtime;
 } SpaceGraph;
@@ -478,7 +478,7 @@ typedef struct SpaceNla {
 	/** This uses the same settings as autosnap for Action Editor. */
 	short autosnap;
 	short flag;
-	int pad;
+	char _pad[4];
 
 	struct bDopeSheet *ads;
 	/** Deprecated, copied to region. */
@@ -539,7 +539,7 @@ typedef struct SpaceSeq {
 	int overlay_type;
 	/** Overlay an image of the editing on below the strips. */
 	int draw_flag;
-	int pad;
+	char _pad[4];
 
 	/** Grease-pencil data. */
 	struct bGPdata *gpd;
@@ -549,10 +549,10 @@ typedef struct SpaceSeq {
 
 	/** Multiview current eye - for internal use. */
 	char multiview_eye;
-	char pad2[7];
+	char _pad2[7];
 
 	struct GPUFX *compositor;
-	void *pad3;
+	void *_pad3;
 } SpaceSeq;
 
 
@@ -613,7 +613,7 @@ typedef struct MaskSpaceInfo {
 	char draw_flag;
 	char draw_type;
 	char overlay_mode;
-	char pad3[5];
+	char _pad3[5];
 } MaskSpaceInfo;
 
 /* SpaceSeq.mainb */
@@ -638,7 +638,7 @@ typedef struct FileSelectParams {
 	 * needs to be linked in, where foo.blend/Armature need adding
 	 */
 	char dir[1090];
-	char pad_c1[2];
+	char _pad0[2];
 	char file[256];
 	char renamefile[256];
 	/** Annoying but the first is only used for initialization. */
@@ -659,7 +659,7 @@ typedef struct FileSelectParams {
 	int sel_first;
 	int sel_last;
 	unsigned short thumbnail_size;
-	short pad;
+	char _pad1[2];
 
 	/* short */
 	/** XXXXX for now store type here, should be moved to the operator. */
@@ -836,7 +836,8 @@ typedef struct AssetUUID {
 
 typedef struct AssetUUIDList {
 	AssetUUID *uuids;
-	int nbr_uuids, pad;
+	int nbr_uuids;
+	char _pad[4];
 } AssetUUIDList;
 
 /* Container for a revision, only relevant in asset context. */
@@ -844,7 +845,7 @@ typedef struct FileDirEntryRevision {
 	struct FileDirEntryRevision *next, *prev;
 
 	char *comment;
-	void *pad;
+	void *_pad;
 
 	int uuid[4];
 
@@ -975,7 +976,7 @@ typedef struct SpaceImage {
 	char mode_prev;
 
 	char  pin;
-	char _pad;
+	char _pad1;
 	/**
 	 * The currently active tile of the image when tile is enabled,
 	 * is kept in sync with the active faces tile.
@@ -992,7 +993,7 @@ typedef struct SpaceImage {
 	int flag;
 
 	char pixel_snap_mode;
-	char pad[3];
+	char _pad2[3];
 
 	MaskSpaceInfo mask_info;
 } SpaceImage;
@@ -1140,7 +1141,7 @@ typedef struct SpaceText {
 	short margin_column;
 	/** Actual lineheight, dpi controlled. */
 	short lheight_dpi;
-	char pad[4];
+	char _pad[4];
 
 	/** Cache for faster drawing. */
 	void *drawcache;
@@ -1209,7 +1210,7 @@ typedef struct SpaceScript {
 	struct Script *script;
 
 	short flags, menunr;
-	int pad1;
+	char _pad1[4];
 
 	void *but_refs;
 } SpaceScript;
@@ -1226,7 +1227,7 @@ typedef struct bNodeTreePath {
 	struct bNodeTree *nodetree;
 	/** Base key for nodes in this tree instance. */
 	bNodeInstanceKey parent_key;
-	int pad;
+	char _pad[4];
 	/** V2d center point, so node trees can have different offsets in editors. */
 	float view_center[2];
 
@@ -1249,9 +1250,11 @@ typedef struct SpaceNode {
 	/** Context, no need to save in file? well... pinning... */
 	struct ID *id, *from;
 	/** Menunr: browse id block in header. */
-	short flag, pad1;
+	short flag;
+	char _pad1[2];
 	/** Internal state variables. */
-	float aspect, pad2;
+	float aspect;
+	char _pad2[4];
 
 	/** Offset for drawing the backdrop. */
 	float xof, yof;
@@ -1273,7 +1276,7 @@ typedef struct SpaceNode {
 	char tree_idname[64];
 	/** Treetype: as same nodetree->type. */
 	int treetype DNA_DEPRECATED;
-	int pad3;
+	char _pad3[4];
 
 	/** Texfrom object, world or brush. */
 	short texfrom;
@@ -1284,7 +1287,7 @@ typedef struct SpaceNode {
 
 	/** Direction for offsetting nodes on insertion. */
 	char insert_ofs_dir;
-	char pad4;
+	char _pad4;
 
 	/** Temporary data for modal linking operator. */
 	ListBase linkdrag;
@@ -1377,7 +1380,8 @@ typedef struct SpaceConsole {
 	/* End 'SpaceLink' header. */
 
 	/* space vars */
-	int lheight, pad;
+	int lheight;
+	char _pad[4];
 
 	/** ConsoleLine; output. */
 	ListBase scrollback;
@@ -1457,7 +1461,7 @@ typedef struct SpaceClip {
 	/* current stabilization data */
 	/** Pre-composed stabilization data. */
 	float loc[2], scale, angle;
-	int pad;
+	char _pad[4];
 	/**
 	 * Current stabilization matrix and the same matrix in unified space,
 	 * defined when drawing and used for mouse position calculation.
@@ -1468,10 +1472,12 @@ typedef struct SpaceClip {
 	int postproc_flag;
 
 	/* grease pencil */
-	short gpencil_src, pad2;
+	short gpencil_src;
+	char _pad2[2];
 
 	/** Pivot point for transforms. */
-	int around, pad4;
+	int around;
+	char _pad4[4];
 
 	/** Mask editor 2d cursor. */
 	float cursor[2];