Merge branch 'master' into blender2.8
[blender.git] / source / blender / modifiers / intern / MOD_collision.c
index 6cf6bd36fff5126faae337100681aca4bc25c8d8..6ec1f4d8e5c776c27450d38bdeab2bf51e2fd49f 100644 (file)
@@ -95,15 +95,15 @@ static bool dependsOnTime(ModifierData *UNUSED(md))
        return true;
 }
 
-static void deformVerts(ModifierData *md, Object *ob,
+static void deformVerts(ModifierData *md, const ModifierEvalContext *ctx,
                         DerivedMesh *derivedData,
                         float (*vertexCos)[3],
-                        int UNUSED(numVerts),
-                        ModifierApplyFlag UNUSED(flag))
+                        int UNUSED(numVerts))
 {
        CollisionModifierData *collmd = (CollisionModifierData *) md;
        DerivedMesh *dm = NULL;
        MVert *tempVert = NULL;
+       Object *ob = ctx->object;
        
        /* if possible use/create DerivedMesh */
        if (derivedData) dm = CDDM_copy(derivedData);
@@ -251,17 +251,25 @@ ModifierTypeInfo modifierType_Collision = {
                                eModifierTypeFlag_Single,
 
        /* copyData */          NULL,
-       /* deformVerts */       deformVerts,
+
+       /* deformVerts_DM */    deformVerts,
+       /* deformMatrices_DM */ NULL,
+       /* deformVertsEM_DM */  NULL,
+       /* deformMatricesEM_DM*/NULL,
+       /* applyModifier_DM */  NULL,
+       /* applyModifierEM_DM */NULL,
+
+       /* deformVerts */       NULL,
        /* deformMatrices */    NULL,
        /* deformVertsEM */     NULL,
        /* deformMatricesEM */  NULL,
        /* applyModifier */     NULL,
        /* applyModifierEM */   NULL,
+
        /* initData */          initData,
        /* requiredDataMask */  NULL,
        /* freeData */          freeData,
        /* isDisabled */        NULL,
-       /* updateDepgraph */    NULL,
        /* updateDepsgraph */   NULL,
        /* dependsOnTime */     dependsOnTime,
        /* dependsOnNormals */  NULL,