[Bf-blender-cvs] [45ffa94] strand_editmode: Merge branch 'gooseberry' into strand_editmode

[Lukas Tönne]

Commit: 45ffa947e11d202eef45a9c308454a4e9c7b4b6a
Author: Lukas Tönne
Date:   Sat Feb 7 15:08:48 2015 +0100
Branches: strand_editmode
https://developer.blender.org/rB45ffa947e11d202eef45a9c308454a4e9c7b4b6a

Merge branch 'gooseberry' into strand_editmode

Conflicts:
	source/blender/makesdna/DNA_customdata_types.h

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



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

diff --cc source/blender/blenkernel/intern/customdata.c
index 717e137,76c597a..3c8d03b
--- a/source/blender/blenkernel/intern/customdata.c
+++ b/source/blender/blenkernel/intern/customdata.c
@@@ -1266,10 -1309,10 +1310,12 @@@ static const LayerTypeInfo LAYERTYPEINF
  	{sizeof(float[4]), "", 0, NULL, NULL, NULL, NULL, NULL, NULL},
  	/* 40: CD_TESSLOOPNORMAL */
  	{sizeof(short[4][3]), "", 0, NULL, NULL, NULL, NULL, layerSwap_flnor, NULL},
- 	/* 41: CD_FACEMAP */
+ 	/* 41: CD_CUSTOMLOOPNORMAL */
+ 	{sizeof(short[2]), "vec2s", 1, NULL, NULL, NULL, NULL, NULL, NULL},
+ 	/* 42: CD_FACEMAP */
  	{sizeof(int), "", 0, NULL, NULL, NULL, NULL, NULL, layerDefault_fmap, NULL},
 +	/* 42: CD_MESH_SAMPLE */
 +	{sizeof(MSurfaceSample), "MSurfaceSample", 1, NULL, NULL, NULL, NULL, NULL, NULL},
  };
  
  /* note, numbers are from trunk and need updating for bmesh */
diff --cc source/blender/makesdna/DNA_customdata_types.h
index 1d15029,aa95403..e0cc318
--- a/source/blender/makesdna/DNA_customdata_types.h
+++ b/source/blender/makesdna/DNA_customdata_types.h
@@@ -63,9 -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[44];              /* 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;
  	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 */
@@@ -119,11 -119,9 +120,11 @@@ typedef enum CustomDataType 
  	CD_FREESTYLE_FACE   = 38,
  	CD_MLOOPTANGENT     = 39,
  	CD_TESSLOOPNORMAL   = 40,
- 	CD_FACEMAP          = 41, /* exclusive face group, each face can only be part of one */
+ 	CD_CUSTOMLOOPNORMAL = 41,
+ 	CD_FACEMAP          = 42, /* exclusive face group, each face can only be part of one */
 -	CD_NUMTYPES         = 43
++	CD_MSURFACE_SAMPLE  = 43,
 +
- 	CD_MSURFACE_SAMPLE  = 42,
- 
- 	CD_NUMTYPES         = 43
++	CD_NUMTYPES         = 44
  } CustomDataType;
  
  /* Bits for CustomDataMask */
@@@ -170,10 -168,9 +171,11 @@@
  #define CD_MASK_FREESTYLE_FACE	(1LL << CD_FREESTYLE_FACE)
  #define CD_MASK_MLOOPTANGENT    (1LL << CD_MLOOPTANGENT)
  #define CD_MASK_TESSLOOPNORMAL  (1LL << CD_TESSLOOPNORMAL)
+ #define CD_MASK_CUSTOMLOOPNORMAL (1LL << CD_CUSTOMLOOPNORMAL)
  #define CD_MASK_FACEMAP         (1LL << CD_FACEMAP)
  
 +#define CD_MASK_MSURFACE_SAMPLE (1LL << CD_MSURFACE_SAMPLE)
 +
  /* CustomData.flag */
  enum {
  	/* Indicates layer should not be copied by CustomData_from_template or CustomData_copy_data */