[Bf-blender-cvs] [8c266669ec9] greasepencil-object: GPencil: Fix struct align after merge

[Antonio Vazquez]

Commit: 8c266669ec9ea1de065ced9e9e970b067f01d2e1
Author: Antonio Vazquez
Date:   Fri Feb 28 22:55:09 2020 +0100
Branches: greasepencil-object
https://developer.blender.org/rB8c266669ec9ea1de065ced9e9e970b067f01d2e1

GPencil: Fix struct align after merge

===================================================================

M	source/blender/makesdna/DNA_brush_types.h

===================================================================

diff --git a/source/blender/makesdna/DNA_brush_types.h b/source/blender/makesdna/DNA_brush_types.h
index 6aaafc51718..170f9938f02 100644
--- a/source/blender/makesdna/DNA_brush_types.h
+++ b/source/blender/makesdna/DNA_brush_types.h
@@ -494,7 +494,6 @@ typedef struct Brush {
   float mask_stencil_pos[2];
   float mask_stencil_dimension[2];
 
-  char _pad3[4];
   struct BrushGpencilSettings *gpencil_settings;
 
 } Brush;