svn merge ^/trunk/blender -r42069:42076
[blender-staging.git] / source / blender / modifiers / intern / MOD_ocean.c
index 81366fba5010bde026b5e71e1c22afd1e09a939c..140acc987709509d3606c6b536521ebe1af9d998 100644 (file)
@@ -516,7 +516,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
 }
 
 static DerivedMesh *applyModifierEM(ModifierData *md, Object *ob,
-                                                                       struct EditMesh *UNUSED(editData),
+                                                                       struct BMEditMesh *UNUSED(editData),
                                                                        DerivedMesh *derivedData)
 {
        return applyModifier(md, ob, derivedData, 0, 1);