[Bf-blender-cvs] [f202dab] gooseberry: Merge branch 'master' into gooseberry

[Bastien Montagne]

Commit: f202dab0f2eaf4e387f16516894db74c0e7e29a0
Author: Bastien Montagne
Date:   Mon Jan 26 17:43:02 2015 +0100
Branches: gooseberry
https://developer.blender.org/rBf202dab0f2eaf4e387f16516894db74c0e7e29a0

Merge branch 'master' into gooseberry

Conflicts:
	source/blender/makesdna/DNA_customdata_types.h

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



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

diff --cc source/blender/makesdna/DNA_customdata_types.h
index 0bba33e,7fedad2..16f28c5
--- a/source/blender/makesdna/DNA_customdata_types.h
+++ b/source/blender/makesdna/DNA_customdata_types.h
@@@ -120,10 -119,9 +120,10 @@@ 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_NUMTYPES         = 41
 +	CD_NUMTYPES         = 42
- };
+ } CustomDataType;
  
  /* Bits for CustomDataMask */
  #define CD_MASK_MVERT		(1 << CD_MVERT)