From 39e0bfe5a29de631b81303d24dd5e397ead60705 Mon Sep 17 00:00:00 2001 From: Antonioya Date: Wed, 2 Jan 2019 10:55:17 +0100 Subject: GP: Cleanup pad to _pad --- source/blender/makesdna/DNA_gpencil_types.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'source/blender/makesdna/DNA_gpencil_types.h') diff --git a/source/blender/makesdna/DNA_gpencil_types.h b/source/blender/makesdna/DNA_gpencil_types.h index 269b19e6ea9..b841aba18de 100644 --- a/source/blender/makesdna/DNA_gpencil_types.h +++ b/source/blender/makesdna/DNA_gpencil_types.h @@ -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; -- cgit v1.2.3