svn merge -r39286:39385 https://svn.blender.org/svnroot/bf-blender/trunk/blender
[blender.git] / source / blender / modifiers / intern / MOD_warp.c
index c1c3604d598b5aa987c64e1957c7ac4c9c8e2874..e6e9c347e6d634e7baa1e8cd833faa1279a3c3b0 100644 (file)
@@ -327,7 +327,7 @@ static void deformVerts(ModifierData *md, Object *ob, DerivedMesh *derivedData,
        }
 }
 
-static void deformVertsEM(ModifierData *md, Object *ob, struct EditMesh *editData,
+static void deformVertsEM(ModifierData *md, Object *ob, struct BMEditMesh *editData,
                           DerivedMesh *derivedData, float (*vertexCos)[3], int numVerts)
 {
        DerivedMesh *dm = derivedData;
@@ -335,7 +335,7 @@ static void deformVertsEM(ModifierData *md, Object *ob, struct EditMesh *editDat
 
        if(use_dm) {
                if(!derivedData)
-                       dm = CDDM_from_editmesh(editData, ob->data);
+                       dm = CDDM_from_BMEditMesh(editData, ob->data, 0);
        }
 
        deformVerts(md, ob, dm, vertexCos, numVerts, 0, 0);