diff options
| author | Joseph Eagar <joeedh@gmail.com> | 2011-04-15 05:19:13 +0400 |
|---|---|---|
| committer | Joseph Eagar <joeedh@gmail.com> | 2011-04-15 05:19:13 +0400 |
| commit | c98148a963d37fc2f25e125afeb4cf21df6fbf14 (patch) | |
| tree | 691a051e27f08e35bf09d35b6fb9c88e4c37b8d2 /source/blender/modifiers/intern/MOD_displace.c | |
| parent | 0bba684d08952d0be822f3906ffb2a03b2674cc2 (diff) | |
| parent | fa63c297753636c149fbb1a3877d9b3d93601357 (diff) | |
=bmesh= merge from trunk at r36153
Diffstat (limited to 'source/blender/modifiers/intern/MOD_displace.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_displace.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/modifiers/intern/MOD_displace.c b/source/blender/modifiers/intern/MOD_displace.c index 6ae5c14d5ef..3ac615d2fc7 100644 --- a/source/blender/modifiers/intern/MOD_displace.c +++ b/source/blender/modifiers/intern/MOD_displace.c @@ -362,14 +362,14 @@ ModifierTypeInfo modifierType_Displace = { /* copyData */ copyData, /* deformVerts */ deformVerts, - /* deformMatrices */ 0, + /* deformMatrices */ NULL, /* deformVertsEM */ deformVertsEM, - /* deformMatricesEM */ 0, - /* applyModifier */ 0, - /* applyModifierEM */ 0, + /* deformMatricesEM */ NULL, + /* applyModifier */ NULL, + /* applyModifierEM */ NULL, /* initData */ initData, /* requiredDataMask */ requiredDataMask, - /* freeData */ 0, + /* freeData */ NULL, /* isDisabled */ isDisabled, /* updateDepgraph */ updateDepgraph, /* dependsOnTime */ dependsOnTime, |