[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [11863] trunk/blender/source/blender/ blenkernel/intern/subsurf_ccg.c:

[Brecht Van Lommel]

Revision: 11863
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11863
Author:   blendix
Date:     2007-08-28 11:30:46 +0200 (Tue, 28 Aug 2007)

Log Message:
-----------

Another fix for the editmode textured draw commit, subsurf vertex color
drawing didn't work.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c

Modified: trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c	2007-08-28 08:59:33 UTC (rev 11862)
+++ trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c	2007-08-28 09:30:46 UTC (rev 11863)
@@ -1744,7 +1744,6 @@
 	char *faceFlags = DM_get_face_data_layer(dm, CD_FLAGS);
 	int i, totface, flag, gridSize = ccgSubSurf_getGridSize(ss);
 	int gridFaces = gridSize - 1;
-	unsigned char *cp;
 
 	totface = ccgSubSurf_getNumFaces(ss);
 	for(i = 0; i < totface; i++) {
@@ -1752,6 +1751,7 @@
 		int S, x, y, numVerts = ccgSubSurf_getFaceNumVerts(ss, f);
 		int drawSmooth, index = ccgDM_getFaceMapIndex(ccgdm, ss, f);
 		int origIndex = (int)ccgSubSurf_getFaceFaceHandle(ss, f);
+		unsigned char *cp= NULL;
 		int mat_nr;
 
 		if(faceFlags) {
@@ -1775,7 +1775,10 @@
 		}
 
 		/* flag 1 == use vertex colors */
-		cp= (flag==1 && mcol)? (unsigned char*)&mcol[i*4]: NULL;
+		if(mcol) {
+			if(flag==1) cp= (unsigned char*)mcol;
+			mcol += gridFaces*gridFaces*numVerts*4;
+		}
 
 		for (S=0; S<numVerts; S++) {
 			VertData *faceGridData = ccgSubSurf_getFaceGridDataArray(ss, f, S);