[Bf-blender-cvs] [7cde506c3c6] greasepencil-object: GPencil: Fix struct alignment error after merge

[Antonio Vazquez]

Commit: 7cde506c3c6c3a54477d105f518dcd02e0814b64
Author: Antonio Vazquez
Date:   Mon Mar 2 13:32:39 2020 +0100
Branches: greasepencil-object
https://developer.blender.org/rB7cde506c3c6c3a54477d105f518dcd02e0814b64

GPencil: Fix struct alignment error 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 2dd30706dc7..fdef0b3602b 100644
--- a/source/blender/makesdna/DNA_brush_types.h
+++ b/source/blender/makesdna/DNA_brush_types.h
@@ -496,6 +496,7 @@ typedef struct Brush {
   float mask_stencil_pos[2];
   float mask_stencil_dimension[2];
 
+  char _pad6[4];
   struct BrushGpencilSettings *gpencil_settings;
 
 } Brush;