[Bf-blender-cvs] [fd9c100e592] greasepencil-object: GPencil: Fix compiler error after merge

[Antonio Vazquez]

Commit: fd9c100e592fb3d02beaa33b71b7753bf9b41a8f
Author: Antonio Vazquez
Date:   Tue Jun 4 11:14:41 2019 +0200
Branches: greasepencil-object
https://developer.blender.org/rBfd9c100e592fb3d02beaa33b71b7753bf9b41a8f

GPencil: Fix compiler error after merge

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

M	source/blender/blenkernel/intern/gpencil_modifier.c
M	source/blender/makesdna/DNA_object_types.h

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

diff --git a/source/blender/blenkernel/intern/gpencil_modifier.c b/source/blender/blenkernel/intern/gpencil_modifier.c
index 669190552df..bc8751caa84 100644
--- a/source/blender/blenkernel/intern/gpencil_modifier.c
+++ b/source/blender/blenkernel/intern/gpencil_modifier.c
@@ -861,7 +861,7 @@ static void gpencil_copy_frame(bGPDframe *gpf, bGPDframe *derived_gpf)
   derived_gpf->flag = gpf->flag;
   derived_gpf->key_type = gpf->key_type;
   derived_gpf->runtime = gpf->runtime;
-  copy_m4_m4(derived_gpf->runtime.viewmatrix, gpf->runtime.viewmatrix);
+  copy_m4_m4(derived_gpf->runtime.parent_obmat, gpf->runtime.parent_obmat);
 
   /* copy strokes */
   BLI_listbase_clear(&derived_gpf->strokes);
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h
index 6a987da3552..65824f69e65 100644
--- a/source/blender/makesdna/DNA_object_types.h
+++ b/source/blender/makesdna/DNA_object_types.h
@@ -176,7 +176,7 @@ typedef struct Object_Runtime {
   struct GpencilBatchCache *gpencil_cache;
   /** Runtime grease pencil total layers used for derived data created by modifiers */
   int tot_layers;
-  char _pad3[4];
+  char _pad4[4];
   /** Runtime grease pencil derived data created by modifiers */
   struct bGPDframe *derived_frames;