[Bf-blender-cvs] [74f1cf31833] greasepencil-object: GPencil: Move variables in struct

[Antonio Vazquez]

Commit: 74f1cf31833707d7a67907c6345d06b32623ef86
Author: Antonio Vazquez
Date:   Mon Nov 4 18:44:20 2019 +0100
Branches: greasepencil-object
https://developer.blender.org/rB74f1cf31833707d7a67907c6345d06b32623ef86

GPencil: Move variables in struct

Also this solves some alignment errors

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

M	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 86d86c813ce..e05634e9c5a 100644
--- a/source/blender/makesdna/DNA_gpencil_types.h
+++ b/source/blender/makesdna/DNA_gpencil_types.h
@@ -79,12 +79,12 @@ typedef struct bGPDspoint {
   /** Uv rotation for dot mode. */
   float uv_rot;
 
-  /** Runtime data */
-  char _pad2[4];
-
   /** Mix color RGBA (A=mix factor) */
   float mix_color[4];
 
+  /** Runtime data */
+  char _pad2[4];
+
   bGPDspoint_Runtime runtime;
 } bGPDspoint;
 
@@ -225,9 +225,6 @@ typedef struct bGPDstroke {
   float gradient_s[2];
   char _pad_3[4];
 
-  /** Vertex mix color for Fill (one for all stroke). */
-  float mix_color_fill[4];
-
   /** UV rotation */
   float uv_rotation;
   /** UV translation (X and Y axis) */
@@ -238,6 +235,9 @@ typedef struct bGPDstroke {
   struct MDeformVert *dvert;
   void *_pad3;
 
+  /** Vertex mix color for Fill (one for all stroke). */
+  float mix_color_fill[4];
+
   bGPDstroke_Runtime runtime;
 } bGPDstroke;