Merge branch 'master' into blender2.8
[blender.git] / source / blender / modifiers / intern / MOD_datatransfer.c
index 863a6a3bb147b82b665cd067adab7325ca4a90ad..21d1a6a865ddaf20699849509a088f08a7f42ec6 100644 (file)
@@ -201,15 +201,6 @@ static DerivedMesh *applyModifier(ModifierData *md, const ModifierEvalContext *c
 #undef HIGH_POLY_WARNING
 #undef DT_TYPES_AFFECT_MESH
 
-static void copyData(ModifierData *md, ModifierData *target)
-{
-#if 0
-       DataTransferModifierData *dtmd = (DecimateModifierData *) md;
-       DataTransferModifierData *tdtmd = (DecimateModifierData *) target;
-#endif
-       modifier_copyData_generic(md, target);
-}
-
 ModifierTypeInfo modifierType_DataTransfer = {
        /* name */              "DataTransfer",
        /* structName */        "DataTransferModifierData",
@@ -220,7 +211,7 @@ ModifierTypeInfo modifierType_DataTransfer = {
                                eModifierTypeFlag_SupportsEditmode |
                                eModifierTypeFlag_UsesPreview,
 
-       /* copyData */          copyData,
+       /* copyData */          modifier_copyData_generic,
 
        /* deformVerts_DM */    NULL,
        /* deformMatrices_DM */ NULL,