Merge branch 'master' into blender2.8
[blender.git] / source / blender / modifiers / intern / MOD_remesh.c
index cfe99c9a91b54287223c3f9179076773d06764d6..454b6b3aa82bdf1910bf8d50337c044d4cc937f6 100644 (file)
@@ -135,9 +135,8 @@ static void dualcon_add_quad(void *output_v, const int vert_indices[4])
 
 static DerivedMesh *applyModifier(
         ModifierData *md,
-        Object *UNUSED(ob),
-        DerivedMesh *dm,
-        ModifierApplyFlag UNUSED(flag))
+        const ModifierEvalContext *UNUSED(ctx),
+        DerivedMesh *dm)
 {
        RemeshModifierData *rmd;
        DualConOutput *output;
@@ -196,9 +195,9 @@ static DerivedMesh *applyModifier(
 #else /* !WITH_MOD_REMESH */
 
 static DerivedMesh *applyModifier(
-        ModifierData *UNUSED(md), Object *UNUSED(ob),
-        DerivedMesh *derivedData,
-        ModifierApplyFlag UNUSED(flag))
+        ModifierData *UNUSED(md),
+        const ModifierEvalContext *UNUSED(ctx),
+        DerivedMesh *derivedData)
 {
        return derivedData;
 }
@@ -213,18 +212,27 @@ ModifierTypeInfo modifierType_Remesh = {
        /* flags */             eModifierTypeFlag_AcceptsMesh |
                                eModifierTypeFlag_AcceptsCVs |
                                eModifierTypeFlag_SupportsEditmode,
+
        /* copyData */          modifier_copyData_generic,
+
+       /* deformVerts_DM */    NULL,
+       /* deformMatrices_DM */ NULL,
+       /* deformVertsEM_DM */  NULL,
+       /* deformMatricesEM_DM*/NULL,
+       /* applyModifier_DM */  applyModifier,
+       /* applyModifierEM_DM */NULL,
+
        /* deformVerts */       NULL,
        /* deformMatrices */    NULL,
        /* deformVertsEM */     NULL,
        /* deformMatricesEM */  NULL,
-       /* applyModifier */     applyModifier,
+       /* applyModifier */     NULL,
        /* applyModifierEM */   NULL,
+
        /* initData */          initData,
        /* requiredDataMask */  NULL,
        /* freeData */          NULL,
        /* isDisabled */        NULL,
-       /* updateDepgraph */    NULL,
        /* updateDepsgraph */   NULL,
        /* dependsOnTime */     NULL,
        /* dependsOnNormals */  NULL,