diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-05-08 16:20:18 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-05-08 16:20:18 +0300 |
| commit | 53a56b7b6c169b21df475ae94795208501581489 (patch) | |
| tree | 011410b7ff5488b5b9d57029ed576929e770bceb /source/blender/modifiers/intern/MOD_lattice.c | |
| parent | d89f9d70c52001e09ee3ab80a3547ba140e00aec (diff) | |
| parent | 3740f7593d7146135c2d2fac363f8aed4ba41cf0 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/modifiers/intern/MOD_lattice.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_lattice.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/source/blender/modifiers/intern/MOD_lattice.c b/source/blender/modifiers/intern/MOD_lattice.c index 69c814279be..548480acdd8 100644 --- a/source/blender/modifiers/intern/MOD_lattice.c +++ b/source/blender/modifiers/intern/MOD_lattice.c @@ -56,16 +56,6 @@ static void initData(ModifierData *md) lmd->strength = 1.0f; } -static void copyData(ModifierData *md, ModifierData *target) -{ -#if 0 - LatticeModifierData *lmd = (LatticeModifierData *) md; - LatticeModifierData *tlmd = (LatticeModifierData *) target; -#endif - - modifier_copyData_generic(md, target); -} - static CustomDataMask requiredDataMask(Object *UNUSED(ob), ModifierData *md) { LatticeModifierData *lmd = (LatticeModifierData *)md; @@ -143,7 +133,8 @@ ModifierTypeInfo modifierType_Lattice = { /* flags */ eModifierTypeFlag_AcceptsCVs | eModifierTypeFlag_AcceptsLattice | eModifierTypeFlag_SupportsEditmode, - /* copyData */ copyData, + + /* copyData */ modifier_copyData_generic, /* deformVerts_DM */ NULL, /* deformMatrices_DM */ NULL, |