[Bf-blender-cvs] [670bf58] temp-derivedmesh-looptri: Use loopcolor for storing texture previews

[Campbell Barton]

Commit: 670bf5846c912d09f6d4e63ddfb6e7e3eff56280
Author: Campbell Barton
Date:   Sun Jul 12 06:27:08 2015 +1000
Branches: temp-derivedmesh-looptri
https://developer.blender.org/rB670bf5846c912d09f6d4e63ddfb6e7e3eff56280

Use loopcolor for storing texture previews

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

M	source/blender/blenkernel/intern/cdderivedmesh.c
M	source/blender/blenkernel/intern/subsurf_ccg.c
M	source/blender/editors/space_view3d/drawmesh.c
M	source/blender/makesdna/DNA_customdata_types.h

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

diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c
index 7feff9c..bcdac7a 100644
--- a/source/blender/blenkernel/intern/cdderivedmesh.c
+++ b/source/blender/blenkernel/intern/cdderivedmesh.c
@@ -506,7 +506,7 @@ static void cdDM_drawFacesTex_common(DerivedMesh *dm,
 		return;
 	}
 
-	colType = CD_TEXTURE_MCOL;
+	colType = CD_TEXTURE_MLOOPCOL;
 	mloopcol = dm->getLoopDataArray(dm, colType);
 	if (!mloopcol) {
 		colType = CD_PREVIEW_MCOL;
@@ -623,7 +623,7 @@ static void cdDM_drawMappedFaces(DerivedMesh *dm,
 	const int *index_mp_to_orig  = dm->getPolyDataArray(dm, CD_ORIGINDEX);
 
 	if (flag & DM_DRAW_USE_COLORS) {
-		colType = CD_TEXTURE_MCOL;
+		colType = CD_TEXTURE_MLOOPCOL;
 		mloopcol = DM_get_loop_data_layer(dm, colType);
 		if (!mloopcol) {
 			colType = CD_PREVIEW_MLOOPCOL;
diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c
index 99c15ff..e152694 100644
--- a/source/blender/blenkernel/intern/subsurf_ccg.c
+++ b/source/blender/blenkernel/intern/subsurf_ccg.c
@@ -2225,7 +2225,7 @@ static void ccgDM_drawFacesTex_common(DerivedMesh *dm,
 	CCGDerivedMesh *ccgdm = (CCGDerivedMesh *) dm;
 	CCGSubSurf *ss = ccgdm->ss;
 	CCGKey key;
-	int colType = CD_TEXTURE_MCOL;
+	int colType = CD_TEXTURE_MLOOPCOL;
 	MCol *mcol = dm->getTessFaceDataArray(dm, colType);
 	MTFace *tf = DM_get_tessface_data_layer(dm, CD_MTFACE);
 	MTFace *tf_stencil_base = NULL;
diff --git a/source/blender/editors/space_view3d/drawmesh.c b/source/blender/editors/space_view3d/drawmesh.c
index 9a4d906..7349380 100644
--- a/source/blender/editors/space_view3d/drawmesh.c
+++ b/source/blender/editors/space_view3d/drawmesh.c
@@ -592,7 +592,7 @@ static void update_tface_color_layer(DerivedMesh *dm, bool use_mcol)
 {
 	MTFace *tface = DM_get_tessface_data_layer(dm, CD_MTFACE);
 	MFace *mface = dm->getTessFaceArray(dm);
-	MCol *finalCol;
+	MLoopCol *finalCol;
 	int i, j;
 	MCol *mcol = NULL;
 
@@ -602,13 +602,12 @@ static void update_tface_color_layer(DerivedMesh *dm, bool use_mcol)
 			mcol = dm->getTessFaceDataArray(dm, CD_MCOL);
 	}
 
-	if (CustomData_has_layer(&dm->faceData, CD_TEXTURE_MCOL)) {
-		finalCol = CustomData_get_layer(&dm->faceData, CD_TEXTURE_MCOL);
+	if (CustomData_has_layer(&dm->loopData, CD_TEXTURE_MLOOPCOL)) {
+		finalCol = CustomData_get_layer(&dm->loopData, CD_TEXTURE_MLOOPCOL);
 	}
 	else {
-		finalCol = MEM_mallocN(sizeof(MCol) * 4 * dm->getNumTessFaces(dm), "add_tface_color_layer");
-
-		CustomData_add_layer(&dm->faceData, CD_TEXTURE_MCOL, CD_ASSIGN, finalCol, dm->numTessFaceData);
+		finalCol = MEM_mallocN(sizeof(MLoopCol) * dm->numLoopData, "add_tface_color_layer");
+		CustomData_add_layer(&dm->loopData, CD_TEXTURE_MLOOPCOL, CD_ASSIGN, finalCol, dm->numLoopData);
 	}
 
 	for (i = 0; i < dm->getNumTessFaces(dm); i++) {
diff --git a/source/blender/makesdna/DNA_customdata_types.h b/source/blender/makesdna/DNA_customdata_types.h
index a92c8b3..79be28b 100644
--- a/source/blender/makesdna/DNA_customdata_types.h
+++ b/source/blender/makesdna/DNA_customdata_types.h
@@ -99,7 +99,7 @@ typedef enum CustomDataType {
 	CD_MDISPS           = 19,
 	CD_PREVIEW_MCOL     = 20,  /* for displaying weightpaint colors */
 /*	CD_ID_MCOL          = 21, */
-	CD_TEXTURE_MCOL     = 22,
+	CD_TEXTURE_MLOOPCOL = 22,
 	CD_CLOTH_ORCO       = 23,
 	CD_RECAST           = 24,