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_wave.c | |
parent | d89f9d70c52001e09ee3ab80a3547ba140e00aec (diff) | |
parent | 3740f7593d7146135c2d2fac363f8aed4ba41cf0 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/modifiers/intern/MOD_wave.c')
-rw-r--r-- | source/blender/modifiers/intern/MOD_wave.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/source/blender/modifiers/intern/MOD_wave.c b/source/blender/modifiers/intern/MOD_wave.c index c5af7755578..f558d3fc5bd 100644 --- a/source/blender/modifiers/intern/MOD_wave.c +++ b/source/blender/modifiers/intern/MOD_wave.c @@ -79,16 +79,6 @@ static void initData(ModifierData *md) wmd->defgrp_name[0] = 0; } -static void copyData(ModifierData *md, ModifierData *target) -{ -#if 0 - WaveModifierData *wmd = (WaveModifierData *) md; - WaveModifierData *twmd = (WaveModifierData *) target; -#endif - - modifier_copyData_generic(md, target); -} - static bool dependsOnTime(ModifierData *UNUSED(md)) { return true; @@ -349,7 +339,8 @@ ModifierTypeInfo modifierType_Wave = { /* flags */ eModifierTypeFlag_AcceptsCVs | eModifierTypeFlag_AcceptsLattice | eModifierTypeFlag_SupportsEditmode, - /* copyData */ copyData, + + /* copyData */ modifier_copyData_generic, /* deformVerts_DM */ deformVerts, /* deformMatrices_DM */ NULL, |