[Bf-blender-cvs] [4d71af8bc44] custom-manipulators: Re-use poly-index layer for face-map

[Campbell Barton]

Commit: 4d71af8bc44a91a0c51aa94eaf10522f72b5a5c0
Author: Campbell Barton
Date:   Tue May 30 16:08:12 2017 +1000
Branches: custom-manipulators
https://developer.blender.org/rB4d71af8bc44a91a0c51aa94eaf10522f72b5a5c0

Re-use poly-index layer for face-map

Poly index was used for a short time when switching to BMesh.

This is practically the same kind of data,
any inconsistency between object face-maps will need to be supported
anyway - since object & mesh might span blend-files.

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

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 6a6d9c8e5f3..26681a29c53 100644
--- a/source/blender/blenkernel/intern/customdata.c
+++ b/source/blender/blenkernel/intern/customdata.c
@@ -1206,8 +1206,8 @@ static const LayerTypeInfo LAYERTYPEINFO[CD_NUMTYPES] = {
 	/* 3 floats per normal vector */
 	{sizeof(float) * 3, "vec3f", 1, NULL, NULL, NULL, layerInterp_normal, NULL, NULL,
 	 NULL, NULL, NULL, NULL, NULL, layerCopyValue_normal},
-	/* 9: CD_POLYINDEX */  /* DEPRECATED */
-	{sizeof(int), "", 0, NULL, NULL, NULL, NULL, NULL, NULL},
+	/* 9: CD_FACEMAP */
+	{sizeof(int), "", 0, NULL, NULL, NULL, NULL, NULL, layerDefault_fmap, NULL},
 	/* 10: CD_PROP_FLT */
 	{sizeof(MFloatProperty), "MFloatProperty", 1, N_("Float"), layerCopy_propFloat, NULL, NULL, NULL},
 	/* 11: CD_PROP_INT */
@@ -1295,8 +1295,6 @@ static const LayerTypeInfo LAYERTYPEINFO[CD_NUMTYPES] = {
 	{sizeof(short[4][3]), "", 0, NULL, NULL, NULL, NULL, layerSwap_flnor, NULL},
 	/* 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},
 };
 
 
diff --git a/source/blender/makesdna/DNA_customdata_types.h b/source/blender/makesdna/DNA_customdata_types.h
index 25732f81b8b..74aebaed8dc 100644
--- a/source/blender/makesdna/DNA_customdata_types.h
+++ b/source/blender/makesdna/DNA_customdata_types.h
@@ -91,7 +91,7 @@ typedef enum CustomDataType {
 	CD_MCOL             = 6,
 	CD_ORIGINDEX        = 7,
 	CD_NORMAL           = 8,
-/*	CD_POLYINDEX        = 9, */
+	CD_FACEMAP          = 9, /* exclusive face group, each face can only be part of one */
 	CD_PROP_FLT         = 10,
 	CD_PROP_INT         = 11,
 	CD_PROP_STR         = 12,
@@ -128,7 +128,6 @@ typedef enum CustomDataType {
 	CD_MLOOPTANGENT     = 39,
 	CD_TESSLOOPNORMAL   = 40,
 	CD_CUSTOMLOOPNORMAL = 41,
-	CD_FACEMAP          = 42, /* exclusive face group, each face can only be part of one */
 
 	CD_NUMTYPES         = 43
 } CustomDataType;
@@ -143,7 +142,7 @@ typedef enum CustomDataType {
 #define CD_MASK_MCOL		(1 << CD_MCOL)
 #define CD_MASK_ORIGINDEX	(1 << CD_ORIGINDEX)
 #define CD_MASK_NORMAL		(1 << CD_NORMAL)
-// #define CD_MASK_POLYINDEX	(1 << CD_POLYINDEX)
+#define CD_MASK_FACEMAP		(1 << CD_FACEMAP)
 #define CD_MASK_PROP_FLT	(1 << CD_PROP_FLT)
 #define CD_MASK_PROP_INT	(1 << CD_PROP_INT)
 #define CD_MASK_PROP_STR	(1 << CD_PROP_STR)
@@ -178,7 +177,6 @@ typedef enum CustomDataType {
 #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)
 
 /* CustomData.flag */
 enum {