[Bf-blender-cvs] [b0a9e48] strand_editmode: New customdata type for mesh surface samples.

[Lukas Tönne]

Commit: b0a9e48a19788145bf6c6a19ca080af7dec97614
Author: Lukas Tönne
Date:   Thu Nov 27 09:35:54 2014 +0100
Branches: strand_editmode
https://developer.blender.org/rBb0a9e48a19788145bf6c6a19ca080af7dec97614

New customdata type for mesh surface samples.

Conflicts:
	source/blender/makesdna/DNA_customdata_types.h

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

M	source/blender/blenkernel/intern/customdata.c
M	source/blender/makesdna/DNA_customdata_types.h

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

diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c
index baf6639..a05082a 100644
--- a/source/blender/blenkernel/intern/customdata.c
+++ b/source/blender/blenkernel/intern/customdata.c
@@ -1317,6 +1317,8 @@ static const LayerTypeInfo LAYERTYPEINFO[CD_NUMTYPES] = {
 	{sizeof(HairEditCurve), "HairEditCurve", 1, NULL, NULL, NULL, NULL, NULL, NULL},
 	/* 43: CD_HAIR_VERT */
 	{sizeof(HairEditVertex), "HairEditVertex", 1, NULL, NULL, NULL, NULL, NULL, NULL},
+	/* 44: CD_MESH_SAMPLE */
+	{sizeof(MSurfaceSample), "MSurfaceSample", 1, NULL, NULL, NULL, NULL, NULL, NULL},
 };
 
 /* note, numbers are from trunk and need updating for bmesh */
diff --git a/source/blender/makesdna/DNA_customdata_types.h b/source/blender/makesdna/DNA_customdata_types.h
index b80ced3..8ab4146 100644
--- a/source/blender/makesdna/DNA_customdata_types.h
+++ b/source/blender/makesdna/DNA_customdata_types.h
@@ -63,10 +63,9 @@ 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[44];              /* runtime only! - maps types to indices of first layer of that type,
+	int typemap[45];              /* 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 */
@@ -125,7 +124,9 @@ typedef enum CustomDataType {
 	CD_HAIR_CURVE       = 42,
 	CD_HAIR_VERT        = 43,
 
-	CD_NUMTYPES         = 44
+	CD_MESH_SAMPLE      = 44,
+
+	CD_NUMTYPES         = 45
 
 /* Bits for CustomDataMask */
 #define CD_MASK_MVERT		(1 << CD_MVERT)
@@ -176,6 +177,8 @@ typedef enum CustomDataType {
 #define CD_MASK_HAIR_CURVE      (1LL << CD_HAIR_CURVE)
 #define CD_MASK_HAIR_VERT       (1LL << CD_HAIR_VERT)
 
+#define CD_MASK_MESH_SAMPLE     (1LL << CD_MESH_SAMPLE)
+
 /* CustomData.flag */
 enum {
 	/* Indicates layer should not be copied by CustomData_from_template or CustomData_copy_data */