svn merge ^/trunk/blender -r41226:41227 .
[blender.git] / source / blender / modifiers / intern / MOD_wave.c
index 6aac707..5d020cc 100644 (file)
@@ -188,11 +188,11 @@ static void wavemod_get_texture_coords(WaveModifierData *wmd, Object *ob,
        /* UVs need special handling, since they come from faces */
        if(texmapping == MOD_WAV_MAP_UV) {
                if(CustomData_has_layer(&dm->faceData, CD_MTFACE)) {
-                       MFace *mface = dm->getFaceArray(dm);
+                       MFace *mface = dm->getTessFaceArray(dm);
                        MFace *mf;
                        char *done = MEM_callocN(sizeof(*done) * numVerts,
                                        "get_texture_coords done");
-                       int numFaces = dm->getNumFaces(dm);
+                       int numFaces = dm->getNumTessFaces(dm);
                        char uvname[32];
                        MTFace *tf;
 
@@ -430,7 +430,7 @@ 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)
 {
        DerivedMesh *dm= derivedData;