Commit: 5484ed01ad1f3035c6a82adfeb19b62ec1180609
Author: Campbell Barton
Date: Wed Jan 2 15:38:45 2019 +1100
Branches: master
https://developer.blender.org/rB5484ed01ad1f3035c6a82adfeb19b62ec1180609
Cleanup: use '_pad' in DNA
Convention used elsewhere, has advantage pad vars don't autocomplete
with other vars beginning w/ 'p'.
===================================================================
M source/blender/makesdna/DNA_gpencil_modifier_types.h
M source/blender/makesdna/DNA_gpencil_types.h
M source/blender/makesdna/DNA_scene_types.h
===================================================================
diff --git a/source/blender/makesdna/DNA_gpencil_modifier_types.h
b/source/blender/makesdna/DNA_gpencil_modifier_types.h
index 5a0707d385f..3e977bf4245 100644
--- a/source/blender/makesdna/DNA_gpencil_modifier_types.h
+++ b/source/blender/makesdna/DNA_gpencil_modifier_types.h
@@ -92,7 +92,7 @@ typedef struct NoiseGpencilModifierData {
float vrand1, vrand2; /* random values */
struct RNG *rng;
int layer_pass; /* custom index for passes */
- char pad_[4];
+ char _pad[4];
} NoiseGpencilModifierData;
typedef enum eNoiseGpencil_Flag {
@@ -154,7 +154,7 @@ typedef struct TimeGpencilModifierData {
float frame_scale; /* animation scale */
int mode;
int sfra, efra; /* start and end frame for custom range */
- char pad_[4];
+ char _pad[4];
} TimeGpencilModifierData;
typedef enum eTimeGpencil_Flag {
@@ -187,7 +187,7 @@ typedef struct TintGpencilModifierData {
char modify_color; /* modify stroke, fill or both */
char pad[7];
int layer_pass; /* custom index for passes */
- char pad_[4];
+ char _pad[4];
} TintGpencilModifierData;
typedef enum eTintGpencil_Flag {
@@ -206,7 +206,7 @@ typedef struct ColorGpencilModifierData {
char modify_color; /* modify stroke, fill or both */
char pad[3];
int layer_pass; /* custom index for passes */
- char pad_[4];
+ char _pad[4];
} ColorGpencilModifierData;
typedef enum eColorGpencil_Flag {
@@ -226,7 +226,7 @@ typedef struct OpacityGpencilModifierData {
char modify_color; /* modify stroke, fill or both */
char pad[3];
int layer_pass; /* custom index for passes */
- char pad_[4];
+ char _pad[4];
} OpacityGpencilModifierData;
typedef enum eOpacityGpencil_Flag {
@@ -249,7 +249,7 @@ typedef struct ArrayGpencilModifierData {
float rot[3]; /* Rotation changes */
float scale[3]; /* Scale changes */
float rnd[20]; /* (first element is the index) random
values */
- char pad_[4];
+ char _pad[4];
int pass_index; /* custom index for passes */
char layername[64]; /* layer name */
@@ -349,7 +349,7 @@ typedef struct MirrorGpencilModifierData {
int pass_index; /* custom index for passes */
int flag; /* flags */
int layer_pass; /* custom index for passes */
- char pad_[4];
+ char _pad[4];
} MirrorGpencilModifierData;
typedef enum eMirrorGpencil_Flag {
@@ -371,7 +371,7 @@ typedef struct HookGpencilModifierData {
char vgname[64]; /* optional vertexgroup name, MAX_VGROUP_NAME */
int pass_index; /* custom index for passes */
int layer_pass; /* custom index for passes */
- char pad_[4];
+ char _pad[4];
int flag;
char falloff_type; /* use enums from WarpGpencilModifier (exact
same functionality) */
@@ -412,7 +412,7 @@ typedef struct SimplifyGpencilModifierData {
short mode; /* type of simplify */
short step; /* every n vertex to keep */
int layer_pass; /* custom index for passes */
- char pad_[4];
+ char _pad[4];
} SimplifyGpencilModifierData;
typedef enum eSimplifyGpencil_Flag {
@@ -456,7 +456,7 @@ typedef struct SmoothGpencilModifierData {
float factor; /* factor of noise */
int step; /* how many times apply smooth */
int layer_pass; /* custom index for passes */
- char pad_[4];
+ char _pad[4];
} SmoothGpencilModifierData;
typedef enum eSmoothGpencil_Flag {
diff --git a/source/blender/makesdna/DNA_gpencil_types.h
b/source/blender/makesdna/DNA_gpencil_types.h
index 567b8687e20..269b19e6ea9 100644
--- a/source/blender/makesdna/DNA_gpencil_types.h
+++ b/source/blender/makesdna/DNA_gpencil_types.h
@@ -178,7 +178,7 @@ typedef struct bGPDstroke {
char colorname[128] DNA_DEPRECATED; /* color name */
int mat_nr; /* material index */
- char pad_[4];
+ char _pad[4];
struct MDeformVert *dvert; /* vertex weight data */
@@ -244,7 +244,7 @@ typedef enum eGPDframe_Flag {
/* Runtime temp data for bGPDlayer */
typedef struct bGPDlayer_Runtime {
int icon_id; /* id for dynamic icon used to show
annotation color preview for layer */
- char pad_[4];
+ char _pad[4];
} bGPDlayer_Runtime;
/* Grease-Pencil Annotations - 'Layer' */
@@ -277,7 +277,7 @@ typedef struct bGPDlayer {
char viewlayername[64]; /* Name of the layer used to filter render
output */
int blend_mode; /* blend modes */
- char pad_[4];
+ char _pad[4];
/* 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) */
@@ -351,7 +351,7 @@ typedef struct bGPdata_Runtime {
*/
short sbuffer_size; /* number of elements currently
in cache */
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 */
char pad1_[4];
@@ -366,7 +366,7 @@ typedef struct bGPgrid {
char _pad1[4];
int lines;
- char pad_[4];
+ char _pad[4];
} bGPgrid;
/* Grease-Pencil Annotations - 'DataBlock' */
diff --git a/source/blender/makesdna/DNA_scene_types.h
b/source/blender/makesdna/DNA_scene_types.h
index 5721dbfade0..1d309e358ac 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -992,7 +992,7 @@ typedef struct GP_Sculpt_Data {
float curcolor_add[3]; /* cursor color for add */
float curcolor_sub[3]; /* cursor color for sub */
float weight; /* target weight */
- char pad_[4];
+ char _pad[4];
} GP_Sculpt_Data;
/* GP_Sculpt_Data.flag */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
