svn merge -r39765:39781 https://svn.blender.org/svnroot/bf-blender/trunk/blender
[blender.git] / source / blender / blenkernel / intern / editderivedbmesh.c
index 9098ce248e09d5d1b81dcb6e540dc1d45117f126..bd9bbf7646a2d0ba61635ac10aafb306f1487257 100644 (file)
@@ -583,7 +583,8 @@ static void bmDM_foreachMappedFaceCenter(DerivedMesh *dm, void (*func)(void *use
 static void bmDM_drawMappedFaces(DerivedMesh *dm, 
        int (*setDrawOptions)(void *userData, int index, int *drawSmooth_r), 
        void *userData, int useColors, 
-       int (*setMaterial)(int, void *attribs))
+       int (*setMaterial)(int, void *attribs),
+       int (*compareDrawOptions)(void *userData, int cur_index, int next_index))
 {
        EditDerivedBMesh *bmdm= (EditDerivedBMesh*) dm;
        BMFace *efa;
@@ -592,7 +593,11 @@ static void bmDM_drawMappedFaces(DerivedMesh *dm,
 
        /*BMESH_TODO*/
        (void)useColors;
-       (void)setMaterial;
+
+       (void)setMaterial; /* UNUSED */
+
+       /* currently unused -- each original face is handled separately */
+       (void)compareDrawOptions;
 
        if (bmdm->vertexCos) {
                BMVert *eve;