projects
/
blender.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' into blender2.8
[blender.git]
/
source
/
blender
/
modifiers
/
intern
/
MOD_shapekey.c
diff --git
a/source/blender/modifiers/intern/MOD_shapekey.c
b/source/blender/modifiers/intern/MOD_shapekey.c
index a4d46527cd29297ba752fe6f6d63fb7314a4a209..4ccf9fabf0c634d81d79a2133be48ed039a89f81 100644
(file)
--- 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,