svn merge ^/trunk/blender -r42761:42776
[blender-staging.git] / source / blender / modifiers / intern / MOD_weightvgedit.c
index bdd7ab7486bc336a14481f1066bd4d883b444c6a..473692f123d40772a1b98f6dc0e86f5a9fdf45d0 100644 (file)
@@ -243,7 +243,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);