[Bf-blender-cvs] [fd9d4da257c] greasepencil-experimental: GPencil: Fix errors after merge and minor cleanup

Antonioya noreply at git.blender.org
Thu May 9 13:42:21 CEST 2019


Commit: fd9d4da257ccabe9832f4dd47616475081836954
Author: Antonioya
Date:   Thu May 9 13:36:21 2019 +0200
Branches: greasepencil-experimental
https://developer.blender.org/rBfd9d4da257ccabe9832f4dd47616475081836954

GPencil: Fix errors after merge and minor cleanup

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

M	source/blender/makesdna/DNA_object_types.h

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

diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h
index 73b47f54c8f..ef7afc390dd 100644
--- a/source/blender/makesdna/DNA_object_types.h
+++ b/source/blender/makesdna/DNA_object_types.h
@@ -165,9 +165,10 @@ typedef struct Object_Runtime {
 
   /** Runtime grease pencil drawing data */
   struct GpencilBatchCache *gpencil_cache;
-  /** Runtime grease pencil derived data created by modifiers */
+  /** Runtime grease pencil total layers used for derived data created by modifiers */
   int tot_layers;
-  char _pad1[4];
+  char _pad2[4];
+  /** Runtime grease pencil derived data created by modifiers */
   struct bGPDframe *derived_frames;
 } Object_Runtime;



More information about the Bf-blender-cvs mailing list