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_particleinstance.c | |
| parent | d89f9d70c52001e09ee3ab80a3547ba140e00aec (diff) | |
| parent | 3740f7593d7146135c2d2fac363f8aed4ba41cf0 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/modifiers/intern/MOD_particleinstance.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_particleinstance.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/source/blender/modifiers/intern/MOD_particleinstance.c b/source/blender/modifiers/intern/MOD_particleinstance.c index 651a5a96676..b87705adb6b 100644 --- a/source/blender/modifiers/intern/MOD_particleinstance.c +++ b/source/blender/modifiers/intern/MOD_particleinstance.c @@ -70,14 +70,6 @@ static void initData(ModifierData *md) STRNCPY(pimd->index_layer_name, ""); STRNCPY(pimd->value_layer_name, ""); } -static void copyData(ModifierData *md, ModifierData *target) -{ -#if 0 - ParticleInstanceModifierData *pimd = (ParticleInstanceModifierData *) md; - ParticleInstanceModifierData *tpimd = (ParticleInstanceModifierData *) target; -#endif - modifier_copyData_generic(md, target); -} static CustomDataMask requiredDataMask(Object *UNUSED(ob), ModifierData *md) { @@ -539,7 +531,7 @@ ModifierTypeInfo modifierType_ParticleInstance = { eModifierTypeFlag_SupportsEditmode | eModifierTypeFlag_EnableInEditmode, - /* copyData */ copyData, + /* copyData */ modifier_copyData_generic, /* deformVerts_DM */ NULL, /* deformMatrices_DM */ NULL, |