svn merge -r36900:37028 https://svn.blender.org/svnroot/bf-blender/trunk/blender
[blender-staging.git] / source / blender / modifiers / intern / MOD_armature.c
index a0ee047e31921711c5a601409e5498bf35e9e16c..4e520f19f585fe9a814e59dd66fb47b77c86c968 100644 (file)
@@ -137,13 +137,13 @@ static void deformVerts(ModifierData *md, Object *ob,
 }
 
 static void deformVertsEM(
-                                          ModifierData *md, Object *ob, struct EditMesh *editData,
+                                          ModifierData *md, Object *ob, struct BMEditMesh *editData,
        DerivedMesh *derivedData, float (*vertexCos)[3], int numVerts)
 {
        ArmatureModifierData *amd = (ArmatureModifierData*) md;
        DerivedMesh *dm = derivedData;
 
-       if(!derivedData) dm = CDDM_from_editmesh(editData, ob->data);
+       if(!derivedData) dm = CDDM_from_BMEditMesh(editData, ob->data, 0);
 
        modifier_vgroup_cache(md, vertexCos); /* if next modifier needs original vertices */
 
@@ -160,14 +160,14 @@ static void deformVertsEM(
 }
 
 static void deformMatricesEM(
-                                                 ModifierData *md, Object *ob, struct EditMesh *editData,
+                                                 ModifierData *md, Object *ob, struct BMEditMesh *editData,
           DerivedMesh *derivedData, float (*vertexCos)[3],
                                                 float (*defMats)[3][3], int numVerts)
 {
        ArmatureModifierData *amd = (ArmatureModifierData*) md;
        DerivedMesh *dm = derivedData;
 
-       if(!derivedData) dm = CDDM_from_editmesh(editData, ob->data);
+       if(!derivedData) dm = CDDM_from_BMEditMesh(editData, ob->data, 0);
 
        armature_deform_verts(amd->object, ob, dm, vertexCos, defMats, numVerts,
                                  amd->deformflag, NULL, amd->defgrp_name);