svn merge ^/trunk/blender -r42761:42776
[blender.git] / source / blender / blenkernel / BKE_modifier.h
index 23073a2d8eb82b9ed2e3d87bd4c52ea25146c64e..d6c48fcb4587c332817f0f965c7b67aede5a533c 100644 (file)
@@ -45,6 +45,7 @@ struct ListBase;
 struct LinkNode;
 struct bArmature;
 struct ModifierData;
+struct BMEditMesh;
 
 typedef enum {
        /* Should not be used, only for None modifier type */
@@ -151,13 +152,13 @@ typedef struct ModifierTypeInfo {
         */
        void (*deformVertsEM)(
                                struct ModifierData *md, struct Object *ob,
-                               struct EditMesh *editData, struct DerivedMesh *derivedData,
+                               struct BMEditMesh *editData, struct DerivedMesh *derivedData,
                                float (*vertexCos)[3], int numVerts);
 
        /* Set deform matrix per vertex for crazyspace correction */
        void (*deformMatricesEM)(
                                struct ModifierData *md, struct Object *ob,
-                               struct EditMesh *editData, struct DerivedMesh *derivedData,
+                               struct BMEditMesh *editData, struct DerivedMesh *derivedData,
                                float (*vertexCos)[3], float (*defMats)[3][3], int numVerts);
 
        /********************* Non-deform modifier functions *********************/
@@ -195,7 +196,7 @@ typedef struct ModifierTypeInfo {
         */
        struct DerivedMesh *(*applyModifierEM)(
                                                                struct ModifierData *md, struct Object *ob,
-                                                               struct EditMesh *editData,
+                                                               struct BMEditMesh *editData,
                                                                struct DerivedMesh *derivedData);