diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-05-08 17:06:32 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-05-08 17:06:32 +0300 |
| commit | 43be4343107b1dc2a05353a6ff41360cce27d629 (patch) | |
| tree | ad47af6e9e207dab52df58c269086c100b613f77 /source/blender/modifiers/intern/MOD_uvproject.c | |
| parent | a48186c5d74b3d353c5c65cd4a930dd98cc9a603 (diff) | |
| parent | 4e4a93bc454d93ec8523f44b73a42977e2868ecc (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/modifiers/intern/MOD_dynamicpaint.c
source/blender/modifiers/intern/MOD_uvproject.c
Diffstat (limited to 'source/blender/modifiers/intern/MOD_uvproject.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_uvproject.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/source/blender/modifiers/intern/MOD_uvproject.c b/source/blender/modifiers/intern/MOD_uvproject.c index d3090f2caf3..a2c767c1242 100644 --- a/source/blender/modifiers/intern/MOD_uvproject.c +++ b/source/blender/modifiers/intern/MOD_uvproject.c @@ -67,16 +67,6 @@ static void initData(ModifierData *md) umd->scalex = umd->scaley = 1.0f; } -static void copyData(const ModifierData *md, ModifierData *target) -{ -#if 0 - const UVProjectModifierData *umd = (const UVProjectModifierData *) md; - UVProjectModifierData *tumd = (UVProjectModifierData *) target; -#endif - - modifier_copyData_generic(md, target); -} - static CustomDataMask requiredDataMask(Object *UNUSED(ob), ModifierData *UNUSED(md)) { CustomDataMask dataMask = 0; @@ -338,7 +328,7 @@ ModifierTypeInfo modifierType_UVProject = { eModifierTypeFlag_SupportsEditmode | eModifierTypeFlag_EnableInEditmode, - /* copyData */ copyData, + /* copyData */ modifier_copyData_generic, /* deformVerts_DM */ NULL, /* deformMatrices_DM */ NULL, |