Merge with trunk r39928
[blender-staging.git] / source / blender / blenkernel / intern / DerivedMesh.c
index 00cf03712ea7055f1f7e8ba30282b85d701db171..04c5bf0e1e0cbe18b45a6ba5601396306232e5ef 100644 (file)
@@ -637,7 +637,8 @@ static void emDM_foreachMappedFaceCenter(DerivedMesh *dm, void (*func)(void *use
 }
 
 /* note, material function is ignored for now. */
-static void emDM_drawMappedFaces(DerivedMesh *dm, int (*setDrawOptions)(void *userData, int index, int *drawSmooth_r), void *userData, int UNUSED(useColors), int (*setMaterial)(int, void *attribs))
+static void emDM_drawMappedFaces(DerivedMesh *dm, int (*setDrawOptions)(void *userData, int index, int *drawSmooth_r), void *userData, int UNUSED(useColors), int (*setMaterial)(int, void *attribs),
+                       int (*compareDrawOptions)(void *userData, int cur_index, int next_index))
 {
        EditMeshDerivedMesh *emdm= (EditMeshDerivedMesh*) dm;
        EditFace *efa;
@@ -645,6 +646,9 @@ static void emDM_drawMappedFaces(DerivedMesh *dm, int (*setDrawOptions)(void *us
        
        (void)setMaterial; /* unused */
 
+       /* currently unused -- each original face is handled separately */
+       (void)compareDrawOptions;
+
        if (emdm->vertexCos) {
                EditVert *eve;