blender
/
blender
134
398
Fork 579
Code Issues 6.3k Pull Requests 750 Projects 19 Wiki Activity

GP: Cleanup pad to _pad

This commit is contained in:
Antonio Vazquez 2019-01-02 10:55:17 +01:00
parent e6d0d04dc3
commit 39e0bfe5a2
2 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -73,7 +73,7 @@ typedef struct GpencilModifierData {
int type, mode;
int stackindex;
short flag;
short pad;
short _pad;
char name[64]; /* MAX_NAME */
char *error;
@ -185,9 +185,9 @@ typedef struct TintGpencilModifierData {
float rgb[3]; /* Tint color */
float factor; /* Mix factor */
char modify_color; /* modify stroke, fill or both */
char pad[7];
char _pad[7];
int layer_pass; /* custom index for passes */
char _pad[4];
char _pad1[4];
} TintGpencilModifierData;
typedef enum eTintGpencil_Flag {
@ -204,9 +204,9 @@ typedef struct ColorGpencilModifierData {
int flag; /* flags */
float hsv[3]; /* hsv factors */
char modify_color; /* modify stroke, fill or both */
char pad[3];
char _pad[3];
int layer_pass; /* custom index for passes */
char _pad[4];
char _pad1[4];
} ColorGpencilModifierData;
typedef enum eColorGpencil_Flag {
@ -224,9 +224,9 @@ typedef struct OpacityGpencilModifierData {
int flag; /* flags */
float factor; /* Main Opacity factor */
char modify_color; /* modify stroke, fill or both */
char pad[3];
char _pad[3];
int layer_pass; /* custom index for passes */
char _pad[4];
char _pad1[4];
} OpacityGpencilModifierData;
typedef enum eOpacityGpencil_Flag {
@ -375,7 +375,7 @@ typedef struct HookGpencilModifierData {
int flag;
char falloff_type; /* use enums from WarpGpencilModifier (exact same functionality) */
char pad[3];
char _pad1[3];
float parentinv[4][4]; /* matrix making current transform unmodified */
float cent[3]; /* visualization of hook */
float falloff; /* if not zero, falloff is distance where influence zero */
@ -473,7 +473,7 @@ typedef enum eSmoothGpencil_Flag {
typedef struct ArmatureGpencilModifierData {
GpencilModifierData modifier;
short deformflag, multi; /* deformflag replaces armature->deformflag */
int pad2;
int _pad;
struct Object *object;
float *prevCos; /* stored input of previous modifier, for vertexgroup blending */
char vgname[64]; /* MAX_VGROUP_NAME */

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

@ -108,7 +108,7 @@ typedef struct bGPDpalettecolor {
float color[4];
float fill[4]; /* color that should be used for drawing "fills" for strokes */
short flag; /* settings for palette color */
char pad[6]; /* padding for compiler alignment error */
char _pad[6]; /* padding for compiler alignment error */
} bGPDpalettecolor;
/* bGPDpalettecolor->flag */
@ -134,7 +134,7 @@ typedef struct bGPDpalette {
char info[64]; /* Palette name. Must be unique. */
short flag;
char pad[6]; /* padding for compiler alignment error */
char _pad[6]; /* padding for compiler alignment error */
} bGPDpalette;
/* bGPDpalette->flag */
@ -171,19 +171,19 @@ typedef struct bGPDstroke {
int tot_triangles; /* number of triangles in array */
short thickness; /* thickness of stroke */
short flag, pad[2]; /* various settings about this stroke */
short flag, _pad[2]; /* various settings about this stroke */
double inittime; /* Init time of stroke */
char colorname[128] DNA_DEPRECATED; /* color name */
int mat_nr; /* material index */
char _pad[4];
char _pad1[4];
struct MDeformVert *dvert; /* vertex weight data */
bGPDstroke_Runtime runtime;
char pad_1[4];
char _pad2[4];
} bGPDstroke;
/* bGPDstroke->flag */
@ -285,7 +285,7 @@ typedef struct bGPDlayer {
float gcolor_prev[3]; /* color for ghosts before the active frame */
float gcolor_next[3]; /* color for ghosts after the active frame */
char pad_1[4];
char _pad1[4];
bGPDlayer_Runtime runtime;
} bGPDlayer;
@ -354,7 +354,7 @@ typedef struct bGPdata_Runtime {
char _pad[6];
int tot_cp_points; /* number of control-points for stroke */
char pad1_[4];
char _pad1_[4];
bGPDcontrolpoint *cp_points; /* array of control-points for stroke */
} bGPdata_Runtime;
@ -379,7 +379,7 @@ typedef struct bGPdata {
int flag; /* settings for this datablock */
short xray_mode; /* xray mode for strokes (eGP_DepthOrdering) */
char pad_1[2];
char _pad1[2];
/* Palettes */
ListBase palettes DNA_DEPRECATED; /* list of bGPDpalette's - Deprecated (2.78 - 2.79 only) */
@ -405,10 +405,10 @@ typedef struct bGPdata {
/* stats */
short totlayer;
short totframe;
char pad_2[6];
char _pad2[6];
int totstroke;
int totpoint;
char pad_3[4];
char _pad3[4];
bGPgrid grid;
bGPdata_Runtime runtime;