svn merge ^/trunk/blender -r42722:42742
[blender.git] / source / blender / modifiers / intern / MOD_weightvgedit.c
index 9721ee042bf88b047a42e741ab6bc2a4e2c3620b..95862f5f0022743ca4ad6d505402153f5f553d67 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);