Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: use '_pad' in DNA

Browse Source 
Convention used elsewhere, has advantage pad vars don't autocomplete
with other vars beginning w/ 'p'.
This commit is contained in:
Campbell Barton
2019-01-02 15:38:45 +11:00
parent 2b3effe0ce
commit 5484ed01ad
3 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
source/blender/makesdna/DNA_gpencil_modifier_types.h
View File

@@ -92,7 +92,7 @@ typedef struct NoiseGpencilModifierData {
float vrand1, vrand2; /* random values */ float vrand1, vrand2; /* random values */
struct RNG *rng; struct RNG *rng;
int layer_pass; /* custom index for passes */ int layer_pass; /* custom index for passes */
char pad_[4]; char _pad[4];
} NoiseGpencilModifierData; } NoiseGpencilModifierData;
typedef enum eNoiseGpencil_Flag { typedef enum eNoiseGpencil_Flag {
@@ -154,7 +154,7 @@ typedef struct TimeGpencilModifierData {
float frame_scale; /* animation scale */ float frame_scale; /* animation scale */
int mode; int mode;
int sfra, efra; /* start and end frame for custom range */ int sfra, efra; /* start and end frame for custom range */
char pad_[4]; char _pad[4];
} TimeGpencilModifierData; } TimeGpencilModifierData;
typedef enum eTimeGpencil_Flag { typedef enum eTimeGpencil_Flag {
@@ -187,7 +187,7 @@ typedef struct TintGpencilModifierData {
char modify_color; /* modify stroke, fill or both */ char modify_color; /* modify stroke, fill or both */
char pad[7]; char pad[7];
int layer_pass; /* custom index for passes */ int layer_pass; /* custom index for passes */
char pad_[4]; char _pad[4];
} TintGpencilModifierData; } TintGpencilModifierData;
typedef enum eTintGpencil_Flag { typedef enum eTintGpencil_Flag {
@@ -206,7 +206,7 @@ typedef struct ColorGpencilModifierData {
char modify_color; /* modify stroke, fill or both */ char modify_color; /* modify stroke, fill or both */
char pad[3]; char pad[3];
int layer_pass; /* custom index for passes */ int layer_pass; /* custom index for passes */
char pad_[4]; char _pad[4];
} ColorGpencilModifierData; } ColorGpencilModifierData;
typedef enum eColorGpencil_Flag { typedef enum eColorGpencil_Flag {
@@ -226,7 +226,7 @@ typedef struct OpacityGpencilModifierData {
char modify_color; /* modify stroke, fill or both */ char modify_color; /* modify stroke, fill or both */
char pad[3]; char pad[3];
int layer_pass; /* custom index for passes */ int layer_pass; /* custom index for passes */
char pad_[4]; char _pad[4];
} OpacityGpencilModifierData; } OpacityGpencilModifierData;
typedef enum eOpacityGpencil_Flag { typedef enum eOpacityGpencil_Flag {
@@ -249,7 +249,7 @@ typedef struct ArrayGpencilModifierData {
float rot[3]; /* Rotation changes */ float rot[3]; /* Rotation changes */
float scale[3]; /* Scale changes */ float scale[3]; /* Scale changes */
float rnd[20]; /* (first element is the index) random values */ float rnd[20]; /* (first element is the index) random values */
char pad_[4]; char _pad[4];
int pass_index; /* custom index for passes */ int pass_index; /* custom index for passes */
char layername[64]; /* layer name */ char layername[64]; /* layer name */
@@ -349,7 +349,7 @@ typedef struct MirrorGpencilModifierData {
int pass_index; /* custom index for passes */ int pass_index; /* custom index for passes */
int flag; /* flags */ int flag; /* flags */
int layer_pass; /* custom index for passes */ int layer_pass; /* custom index for passes */
char pad_[4]; char _pad[4];
} MirrorGpencilModifierData; } MirrorGpencilModifierData;
typedef enum eMirrorGpencil_Flag { typedef enum eMirrorGpencil_Flag {
@@ -371,7 +371,7 @@ typedef struct HookGpencilModifierData {
char vgname[64]; /* optional vertexgroup name, MAX_VGROUP_NAME */ char vgname[64]; /* optional vertexgroup name, MAX_VGROUP_NAME */
int pass_index; /* custom index for passes */ int pass_index; /* custom index for passes */
int layer_pass; /* custom index for passes */ int layer_pass; /* custom index for passes */
char pad_[4]; char _pad[4];
int flag; int flag;
char falloff_type; /* use enums from WarpGpencilModifier (exact same functionality) */ char falloff_type; /* use enums from WarpGpencilModifier (exact same functionality) */
@@ -412,7 +412,7 @@ typedef struct SimplifyGpencilModifierData {
short mode; /* type of simplify */ short mode; /* type of simplify */
short step; /* every n vertex to keep */ short step; /* every n vertex to keep */
int layer_pass; /* custom index for passes */ int layer_pass; /* custom index for passes */
char pad_[4]; char _pad[4];
} SimplifyGpencilModifierData; } SimplifyGpencilModifierData;
typedef enum eSimplifyGpencil_Flag { typedef enum eSimplifyGpencil_Flag {
@@ -456,7 +456,7 @@ typedef struct SmoothGpencilModifierData {
float factor; /* factor of noise */ float factor; /* factor of noise */
int step; /* how many times apply smooth */ int step; /* how many times apply smooth */
int layer_pass; /* custom index for passes */ int layer_pass; /* custom index for passes */
char pad_[4]; char _pad[4];
} SmoothGpencilModifierData; } SmoothGpencilModifierData;
typedef enum eSmoothGpencil_Flag { typedef enum eSmoothGpencil_Flag {

10
source/blender/makesdna/DNA_gpencil_types.h
View File

@@ -178,7 +178,7 @@ typedef struct bGPDstroke {
char colorname[128] DNA_DEPRECATED; /* color name */ char colorname[128] DNA_DEPRECATED; /* color name */
int mat_nr; /* material index */ int mat_nr; /* material index */
char pad_[4]; char _pad[4];
struct MDeformVert *dvert; /* vertex weight data */ struct MDeformVert *dvert; /* vertex weight data */
@@ -244,7 +244,7 @@ typedef enum eGPDframe_Flag {
/* Runtime temp data for bGPDlayer */ /* Runtime temp data for bGPDlayer */
typedef struct bGPDlayer_Runtime { typedef struct bGPDlayer_Runtime {
int icon_id; /* id for dynamic icon used to show annotation color preview for layer */ int icon_id; /* id for dynamic icon used to show annotation color preview for layer */
char pad_[4]; char _pad[4];
} bGPDlayer_Runtime; } bGPDlayer_Runtime;
/* Grease-Pencil Annotations - 'Layer' */ /* Grease-Pencil Annotations - 'Layer' */
@@ -277,7 +277,7 @@ typedef struct bGPDlayer {
char viewlayername[64]; /* Name of the layer used to filter render output */ char viewlayername[64]; /* Name of the layer used to filter render output */
int blend_mode; /* blend modes */ int blend_mode; /* blend modes */
char pad_[4]; char _pad[4];
/* annotation onion skin */ /* annotation onion skin */
short gstep; /* Ghosts Before: max number of ghost frames to show between active frame and the one before it (0 = only the ghost itself) */ short gstep; /* Ghosts Before: max number of ghost frames to show between active frame and the one before it (0 = only the ghost itself) */
@@ -351,7 +351,7 @@ typedef struct bGPdata_Runtime {
*/ */
short sbuffer_size; /* number of elements currently in cache */ short sbuffer_size; /* number of elements currently in cache */
short sbuffer_sflag; /* flags for stroke that cache represents */ short sbuffer_sflag; /* flags for stroke that cache represents */
char pad_[6]; char _pad[6];
int tot_cp_points; /* number of control-points for stroke */ int tot_cp_points; /* number of control-points for stroke */
char pad1_[4]; char pad1_[4];
@@ -366,7 +366,7 @@ typedef struct bGPgrid {
char _pad1[4]; char _pad1[4];
int lines; int lines;
char pad_[4]; char _pad[4];
} bGPgrid; } bGPgrid;
/* Grease-Pencil Annotations - 'DataBlock' */ /* Grease-Pencil Annotations - 'DataBlock' */

2
source/blender/makesdna/DNA_scene_types.h
View File

@@ -992,7 +992,7 @@ typedef struct GP_Sculpt_Data {
float curcolor_add[3]; /* cursor color for add */ float curcolor_add[3]; /* cursor color for add */
float curcolor_sub[3]; /* cursor color for sub */ float curcolor_sub[3]; /* cursor color for sub */
float weight; /* target weight */ float weight; /* target weight */
char pad_[4]; char _pad[4];
} GP_Sculpt_Data; } GP_Sculpt_Data;
/* GP_Sculpt_Data.flag */ /* GP_Sculpt_Data.flag */