[Bf-blender-cvs] [e109fdea5a2] custom-manipulators: Missed while updating custom-data again!

[Campbell Barton]

Commit: e109fdea5a2895f1f9b3408d0e80e5878cd06409
Author: Campbell Barton
Date:   Tue May 30 17:30:22 2017 +1000
Branches: custom-manipulators
https://developer.blender.org/rBe109fdea5a2895f1f9b3408d0e80e5878cd06409

Missed while updating custom-data again!

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

M	source/blender/makesdna/DNA_customdata_types.h
M	source/blender/makesdna/DNA_object_types.h

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

diff --git a/source/blender/makesdna/DNA_customdata_types.h b/source/blender/makesdna/DNA_customdata_types.h
index 74aebaed8dc..0e0b1d669d9 100644
--- a/source/blender/makesdna/DNA_customdata_types.h
+++ b/source/blender/makesdna/DNA_customdata_types.h
@@ -63,9 +63,10 @@ typedef struct CustomDataExternal {
  * layers, each with a data type (e.g. MTFace, MDeformVert, etc.). */
 typedef struct CustomData {
 	CustomDataLayer *layers;      /* CustomDataLayers, ordered by type */
-	int typemap[43];              /* runtime only! - maps types to indices of first layer of that type,
+	int typemap[42];              /* runtime only! - maps types to indices of first layer of that type,
 	                               * MUST be >= CD_NUMTYPES, but we cant use a define here.
 	                               * Correct size is ensured in CustomData_update_typemap assert() */
+	int pad_i1;
 	int totlayer, maxlayer;       /* number of layers, size of layers array */
 	int totsize;                  /* in editmode, total size of all data layers */
 	struct BLI_mempool *pool;     /* (BMesh Only): Memory pool for allocation of blocks */
@@ -129,7 +130,7 @@ typedef enum CustomDataType {
 	CD_TESSLOOPNORMAL   = 40,
 	CD_CUSTOMLOOPNORMAL = 41,
 
-	CD_NUMTYPES         = 43
+	CD_NUMTYPES         = 42
 } CustomDataType;
 
 /* Bits for CustomDataMask */
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h
index 4bd60f1760e..569d63a3d3d 100644
--- a/source/blender/makesdna/DNA_object_types.h
+++ b/source/blender/makesdna/DNA_object_types.h
@@ -263,7 +263,7 @@ typedef struct Object {
 	short index;			/* custom index, for renderpasses */
 	unsigned short actdef;	/* current deformation group, note: index starts at 1 */
 	unsigned short actfmap;	/* current face map, note: index starts at 1 */
-	unsigned short pad9[3];
+	unsigned char pad5[6];
 	float col[4];			/* object color */
 
 	int gameflag;