svn merge ^/trunk/blender -r42761:42776

[blender-staging.git] / source / blender / modifiers / intern / MOD_weightvgmix.c

diff --git a/source/blender/modifiers/intern/MOD_weightvgmix.c b/source/blender/modifiers/intern/MOD_weightvgmix.c
index 17316d891dafa6c188e277ce5fbe5ec32cb86386..316080ba4a7489a21bc12f45da487b932c37c229 100644 (file)
--- a/source/blender/modifiers/intern/MOD_weightvgmix.c
+++ b/source/blender/modifiers/intern/MOD_weightvgmix.c
@@ -375,7 +375,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, DerivedMesh *der
 }
 
 static DerivedMesh *applyModifierEM(ModifierData *md, Object *ob,
 }
 
 static DerivedMesh *applyModifierEM(ModifierData *md, Object *ob,

-                                    struct EditMesh *UNUSED(editData),
+                                    struct BMEditMesh *UNUSED(editData),

                                     DerivedMesh *derivedData)
 {
        return applyModifier(md, ob, derivedData, 0, 1);
                                     DerivedMesh *derivedData)
 {
        return applyModifier(md, ob, derivedData, 0, 1);