svn merge -r40034:40051 https://svn.blender.org/svnroot/bf-blender/trunk/blender
[blender-staging.git] / source / blender / modifiers / intern / MOD_weightvgmix.c
index f1422a342ebf6a4c7746575a2fcc63ab06d5374a..8093683a098ef4a8d7d8459a29180e654444e8a8 100644 (file)
@@ -292,7 +292,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, DerivedMesh *der
        else
                ret = dm;
 #else
-       ret = CDDM_copy(dm);
+       ret = CDDM_copy(dm, 0);
        rel_ret = 1;
        dvert = ret->getVertDataArray(ret, CD_MDEFORMVERT);
        if (dvert == NULL) {
@@ -430,7 +430,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);