Merge branch 'master' into blender2.8
[blender.git] / source / blender / modifiers / intern / MOD_softbody.c
index 876f56f4192ee645519809c4d904fb01699a4fbe..a62b21df231052a9fa7d64e4f6c4f5da01a4ffc8 100644 (file)
 
 #include "MOD_modifiertypes.h"
 
-static void deformVerts(ModifierData *md, Depsgraph *depsgraph, Object *ob,
-                        DerivedMesh *UNUSED(derivedData),
-                        float (*vertexCos)[3],
-                        int numVerts,
-                        ModifierApplyFlag UNUSED(flag))
+static void deformVerts(
+        ModifierData *md, const ModifierEvalContext *ctx,
+        DerivedMesh *UNUSED(derivedData),
+        float (*vertexCos)[3],
+        int numVerts)
 {
-       sbObjectStep(depsgraph, md->scene, ob, (float)md->scene->r.cfra, vertexCos, numVerts);
+       sbObjectStep(ctx->depsgraph, md->scene, ctx->object, (float)md->scene->r.cfra, vertexCos, numVerts);
 }
 
 static bool dependsOnTime(ModifierData *UNUSED(md))
@@ -84,12 +84,21 @@ ModifierTypeInfo modifierType_Softbody = {
                                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 */          NULL,
        /* requiredDataMask */  NULL,
        /* freeData */          NULL,