svn merge ^/trunk/blender -r42722:42742
[blender.git] / source / blender / modifiers / intern / MOD_weightvgmix.c
index fd7e47cc4bf13dac069a74baee9f2150e70c3d5e..34e73adb4b43efcdf5f1a8c9e9337dcc9a65054d 100644 (file)
@@ -375,7 +375,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, DerivedMesh *der
 }
 
 static DerivedMesh *applyModifierEM(ModifierData *md, Object *ob,
-                                    struct EditMesh *UNUSED(editData),
+                                    struct BMEditMesh *UNUSED(editData),
                                     DerivedMesh *derivedData)
 {
        return applyModifier(md, ob, derivedData, 0, 1);