diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-08-16 10:30:14 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-08-16 10:30:14 +0400 |
| commit | 55a560c0c4578de7d7378fdc3a3f533adce05b8c (patch) | |
| tree | e0591531a26140e65748ca9853dd497af19a802a /source/blender/modifiers/intern/MOD_shapekey.c | |
| parent | ec5d518300ec981d902fae6a45454ff0ae94269a (diff) | |
| parent | 0b23d378fbac8e76d4885c3485a4dbf158aab136 (diff) | |
svn merge -r39286:39385 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Diffstat (limited to 'source/blender/modifiers/intern/MOD_shapekey.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_shapekey.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/modifiers/intern/MOD_shapekey.c b/source/blender/modifiers/intern/MOD_shapekey.c index 254814feb37..4368f1718ff 100644 --- a/source/blender/modifiers/intern/MOD_shapekey.c +++ b/source/blender/modifiers/intern/MOD_shapekey.c @@ -148,5 +148,6 @@ ModifierTypeInfo modifierType_ShapeKey = { /* dependsOnTime */ NULL, /* dependsOnNormals */ NULL, /* foreachObjectLink */ NULL, - /* foreachIDLink */ NULL + /* foreachIDLink */ NULL, + /* foreachTexLink */ NULL, }; |