[Bf-blender-cvs] [a472fb2] temp-derivedmesh-looptri: Some parts of code still used MCol

[Campbell Barton]

Commit: a472fb2b78772206b7963f88bd0ce5a184c82c08
Author: Campbell Barton
Date:   Sun Jul 12 03:21:24 2015 +1000
Branches: temp-derivedmesh-looptri
https://developer.blender.org/rBa472fb2b78772206b7963f88bd0ce5a184c82c08

Some parts of code still used MCol

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

M	source/blender/blenkernel/intern/cdderivedmesh.c
M	source/blender/blenkernel/intern/subsurf_ccg.c

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

diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c
index 993a011..45c3548 100644
--- a/source/blender/blenkernel/intern/cdderivedmesh.c
+++ b/source/blender/blenkernel/intern/cdderivedmesh.c
@@ -481,7 +481,7 @@ static void cdDM_drawFacesTex_common(DerivedMesh *dm,
 	CDDerivedMesh *cddm = (CDDerivedMesh *) dm;
 	MTFace *tf = DM_get_tessface_data_layer(dm, CD_MTFACE);
 	const MPoly *mpoly = cddm->mpoly;
-	MCol *mcol;
+	MLoopCol *mloopcol;
 	int i, orig;
 	int colType, startFace = 0;
 	bool use_tface = (uvflag & DM_DRAW_USE_ACTIVE_UV) != 0;
@@ -507,14 +507,14 @@ static void cdDM_drawFacesTex_common(DerivedMesh *dm,
 	}
 
 	colType = CD_TEXTURE_MCOL;
-	mcol = dm->getLoopDataArray(dm, colType);
-	if (!mcol) {
+	mloopcol = dm->getLoopDataArray(dm, colType);
+	if (!mloopcol) {
 		colType = CD_PREVIEW_MCOL;
-		mcol = dm->getLoopDataArray(dm, colType);
+		mloopcol = dm->getLoopDataArray(dm, colType);
 	}
-	if (!mcol) {
+	if (!mloopcol) {
 		colType = CD_MLOOPCOL;
-		mcol = dm->getLoopDataArray(dm, colType);
+		mloopcol = dm->getLoopDataArray(dm, colType);
 	}
 
 	cdDM_update_normals_from_pbvh(dm);
@@ -525,7 +525,7 @@ static void cdDM_drawFacesTex_common(DerivedMesh *dm,
 		GPU_texpaint_uv_setup(dm);
 	else
 		GPU_uv_setup(dm);
-	if (mcol) {
+	if (mloopcol) {
 		GPU_color_setup(dm, colType);
 	}
 	
@@ -543,7 +543,7 @@ static void cdDM_drawFacesTex_common(DerivedMesh *dm,
 			next_actualFace = dm->drawObject->triangle_to_mpoly[i + 1];
 		
 		if (drawParams) {
-			draw_option = drawParams(use_tface && tf ? &tf[actualFace] : NULL, (mcol != NULL), mpoly[actualFace].mat_nr);
+			draw_option = drawParams(use_tface && tf ? &tf[actualFace] : NULL, (mloopcol != NULL), mpoly[actualFace].mat_nr);
 		}
 		else {
 			if (index_mp_to_orig) {
@@ -578,7 +578,7 @@ static void cdDM_drawFacesTex_common(DerivedMesh *dm,
 			int count = (i - startFace + (draw_option != DM_DRAW_OPTION_SKIP ? 1 : 0)) * 3;
 			
 			if (count) {
-				if (mcol && draw_option != DM_DRAW_OPTION_NO_MCOL)
+				if (mloopcol && draw_option != DM_DRAW_OPTION_NO_MCOL)
 					GPU_color_switch(1);
 				else
 					GPU_color_switch(0);
@@ -614,7 +614,7 @@ static void cdDM_drawMappedFaces(DerivedMesh *dm,
 	const MPoly *mpoly = cddm->mpoly;
 	const MLoop *mloop = cddm->mloop;
 	const MLoopTri *lt = dm->looptris.array;
-	const MLoopCol *mcol = NULL;
+	const MLoopCol *mloopcol = NULL;
 	const float *nors = DM_get_tessface_data_layer(dm, CD_NORMAL);
 	const short (*lnors)[4][3] = dm->getTessFaceDataArray(dm, CD_TESSLOOPNORMAL);
 	int colType;
@@ -624,14 +624,14 @@ static void cdDM_drawMappedFaces(DerivedMesh *dm,
 
 	if (flag & DM_DRAW_USE_COLORS) {
 		colType = CD_TEXTURE_MCOL;
-		mcol = DM_get_loop_data_layer(dm, colType);
-		if (!mcol) {
-			colType = CD_PREVIEW_MCOL;
-			mcol = DM_get_loop_data_layer(dm, colType);
+		mloopcol = DM_get_loop_data_layer(dm, colType);
+		if (!mloopcol) {
+			colType = CD_PREVIEW_MLOOPCOL;
+			mloopcol = DM_get_loop_data_layer(dm, colType);
 		}
-		if (!mcol) {
+		if (!mloopcol) {
 			colType = CD_MLOOPCOL;
-			mcol = DM_get_loop_data_layer(dm, colType);
+			mloopcol = DM_get_loop_data_layer(dm, colType);
 		}
 	}
 
@@ -670,7 +670,7 @@ static void cdDM_drawMappedFaces(DerivedMesh *dm,
 
 				if (lnors) {
 					for (j = 0; j < 3; j++) {
-						if (mcol) glColor3ubv((unsigned char *)&mcol[ltri[j]].r);
+						if (mloopcol) glColor3ubv((unsigned char *)&mloopcol[ltri[j]].r);
 						glNormal3sv((const GLshort *)lnors[0][j]);
 						glVertex3fv(mvert[vtri[j]].co);
 					}
@@ -687,13 +687,13 @@ static void cdDM_drawMappedFaces(DerivedMesh *dm,
 					}
 
 					for (j = 0; j < 3; j++) {
-						if (mcol) glColor3ubv((unsigned char *)&mcol[ltri[j]].r);
+						if (mloopcol) glColor3ubv((unsigned char *)&mloopcol[ltri[j]].r);
 						glVertex3fv(mvert[vtri[j]].co);
 					}
 				}
 				else {
 					for (j = 0; j < 3; j++) {
-						if (mcol) glColor3ubv((unsigned char *)&mcol[ltri[j]].r);
+						if (mloopcol) glColor3ubv((unsigned char *)&mloopcol[ltri[j]].r);
 						glNormal3sv(mvert[vtri[j]].no);
 						glVertex3fv(mvert[vtri[j]].co);
 					}
@@ -717,7 +717,7 @@ static void cdDM_drawMappedFaces(DerivedMesh *dm,
 		
 		GPU_vertex_setup(dm);
 		GPU_normal_setup(dm);
-		if (mcol) {
+		if (mloopcol) {
 			GPU_color_setup(dm, colType);
 		}
 		tottri = dm->drawObject->tot_triangle_point / 3;
diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c
index 2f4d26d..99c15ff 100644
--- a/source/blender/blenkernel/intern/subsurf_ccg.c
+++ b/source/blender/blenkernel/intern/subsurf_ccg.c
@@ -2513,7 +2513,7 @@ static void ccgDM_drawMappedFaces(DerivedMesh *dm,
 	CCGDerivedMesh *ccgdm = (CCGDerivedMesh *) dm;
 	CCGSubSurf *ss = ccgdm->ss;
 	CCGKey key;
-	MCol *mcol = NULL;
+	MLoopCol *mloopcol = NULL;
 	short (*lnors)[4][3] = dm->getTessFaceDataArray(dm, CD_TESSLOOPNORMAL);
 	int i, gridSize = ccgSubSurf_getGridSize(ss);
 	DMFlagMat *faceFlags = ccgdm->faceFlags;
@@ -2527,9 +2527,9 @@ static void ccgDM_drawMappedFaces(DerivedMesh *dm,
 	(void)compareDrawOptions;
 
 	if (useColors) {
-		mcol = dm->getTessFaceDataArray(dm, CD_PREVIEW_MCOL);
-		if (!mcol)
-			mcol = dm->getTessFaceDataArray(dm, CD_MCOL);
+		mloopcol = dm->getLoopDataArray(dm, CD_PREVIEW_MLOOPCOL);
+		if (!mloopcol)
+			mloopcol = dm->getLoopDataArray(dm, CD_MLOOPCOL);
 	}
 
 	totface = ccgSubSurf_getNumFaces(ss);
@@ -2547,9 +2547,9 @@ static void ccgDM_drawMappedFaces(DerivedMesh *dm,
 		else if (faceFlags) drawSmooth = (lnors || (faceFlags[origIndex].flag & ME_SMOOTH));
 		else drawSmooth = 1;
 
-		if (mcol) {
-			cp = (unsigned char *)mcol;
-			mcol += gridFaces * gridFaces * numVerts * 4;
+		if (mloopcol) {
+			cp = (unsigned char *)mloopcol;
+			mloopcol += gridFaces * gridFaces * numVerts * 4;
 		}
 
 		if (lnors) {