diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-05-09 13:38:48 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-05-09 13:38:48 +0400 |
| commit | 5776d7ff9c24edf516616490377678de5ce3d0a1 (patch) | |
| tree | 09c91faa6edc0f313aefff5725da10a229a5e9a0 /source/blender/modifiers/intern/MOD_warp.c | |
| parent | 9d8a08de559f2339fa084985510bf151ade76a4e (diff) | |
| parent | 4c71d9efb536b53e8f1f5fd4c950d32bfa29b363 (diff) | |
svn merge -r36529:36564 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Diffstat (limited to 'source/blender/modifiers/intern/MOD_warp.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_warp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/modifiers/intern/MOD_warp.c b/source/blender/modifiers/intern/MOD_warp.c index 015087be39a..cfb3e839771 100644 --- a/source/blender/modifiers/intern/MOD_warp.c +++ b/source/blender/modifiers/intern/MOD_warp.c @@ -350,7 +350,7 @@ ModifierTypeInfo modifierType_Warp = { /* deformVerts */ deformVerts, /* deformMatrices */ NULL, /* deformVertsEM */ deformVertsEM, - /* deformMatricesEM */ NULL, + /* deformMatricesEM */ NULL, /* applyModifier */ 0, /* applyModifierEM */ 0, /* initData */ initData, @@ -359,7 +359,7 @@ ModifierTypeInfo modifierType_Warp = { /* isDisabled */ isDisabled, /* updateDepgraph */ updateDepgraph, /* dependsOnTime */ dependsOnTime, - /* dependsOnNormals */ NULL, + /* dependsOnNormals */ NULL, /* foreachObjectLink */ foreachObjectLink, /* foreachIDLink */ foreachIDLink, }; |