svn merge -r39765:39781 https://svn.blender.org/svnroot/bf-blender/trunk/blender
[blender.git] / source / blender / blenkernel / intern / subsurf_ccg.c
index 5a96ce295fbf4f06fd7232540e0ea42e1058cce9..429323e38dd1a70122447f8a8a169b1ebb66f4c0 100644 (file)
@@ -1998,7 +1998,8 @@ static void cgdm_drawUVEdges(DerivedMesh *dm)
        }
 }
 
-static void ccgDM_drawMappedFaces(DerivedMesh *dm, int (*setDrawOptions)(void *userData, int index, int *drawSmooth_r), void *userData, int useColors, int (*setMaterial)(int, void *attribs)) {
+static void ccgDM_drawMappedFaces(DerivedMesh *dm, int (*setDrawOptions)(void *userData, int index, int *drawSmooth_r), void *userData, int useColors, int (*setMaterial)(int, void *attribs),
+                       int (*compareDrawOptions)(void *userData, int cur_index, int next_index)) {
        CCGDerivedMesh *cgdm = (CCGDerivedMesh*) dm;
        CCGSubSurf *ss = cgdm->ss;
        MCol *mcol= NULL;
@@ -2006,6 +2007,9 @@ static void ccgDM_drawMappedFaces(DerivedMesh *dm, int (*setDrawOptions)(void *u
        char *faceFlags = cgdm->faceFlags;
        int gridFaces = gridSize - 1, totface;
 
+       /* currently unused -- each original face is handled separately */
+       (void)compareDrawOptions;
+
        if(useColors) {
                mcol = dm->getTessFaceDataArray(dm, CD_WEIGHT_MCOL);
                if(!mcol)