archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Merge branch 'master' into blender2.8

Browse Source
This commit is contained in:
Bastien Montagne
2018-05-08 15:20:18 +02:00
parent d89f9d70c5 3740f7593d
commit 53a56b7b6c
55 changed files with 83 additions and 361 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
source/blender/modifiers/intern/MOD_lattice.c
View File

@@ -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,