diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-06-07 10:58:27 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-06-07 10:59:26 +0300 |
commit | 24d29f2e500771257cc962e899630edaccb01cfe (patch) | |
tree | 600780f0dab7f3efe5477eb24d59c533bc2abdc6 /source/blender/modifiers/intern/MOD_shapekey.c | |
parent | 11af9e9a5bd1caff1ec46794bda2934a01ce5035 (diff) | |
parent | 3054e33d67c8f524dae915c8f1f016a7bfa63ab0 (diff) |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/blenkernel/intern/particle.c
source/blender/editors/transform/transform_snap_object.c
Diffstat (limited to 'source/blender/modifiers/intern/MOD_shapekey.c')
-rw-r--r-- | source/blender/modifiers/intern/MOD_shapekey.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/modifiers/intern/MOD_shapekey.c b/source/blender/modifiers/intern/MOD_shapekey.c index a4d46527cd2..4ccf9fabf0c 100644 --- a/source/blender/modifiers/intern/MOD_shapekey.c +++ b/source/blender/modifiers/intern/MOD_shapekey.c @@ -124,6 +124,7 @@ ModifierTypeInfo modifierType_ShapeKey = { /* structSize */ sizeof(ShapeKeyModifierData), /* type */ eModifierTypeType_OnlyDeform, /* flags */ eModifierTypeFlag_AcceptsCVs | + eModifierTypeFlag_AcceptsLattice | eModifierTypeFlag_SupportsEditmode, /* copyData */ NULL, |