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_displace.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_displace.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_displace.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/source/blender/modifiers/intern/MOD_displace.c b/source/blender/modifiers/intern/MOD_displace.c index 15af3132b04..7bd2dbaa7e0 100644 --- a/source/blender/modifiers/intern/MOD_displace.c +++ b/source/blender/modifiers/intern/MOD_displace.c @@ -134,6 +134,12 @@ static void foreachIDLink(ModifierData *md, Object *ob, foreachObjectLink(md, ob, (ObjectWalkFunc)walk, userData); } +static void foreachTexLink(ModifierData *md, Object *ob, + TexWalkFunc walk, void *userData) +{ + walk(userData, ob, md, "texture"); +} + static int isDisabled(ModifierData *md, int UNUSED(useRenderParams)) { DisplaceModifierData *dmd = (DisplaceModifierData*) md; @@ -284,4 +290,5 @@ ModifierTypeInfo modifierType_Displace = { /* dependsOnNormals */ dependsOnNormals, /* foreachObjectLink */ foreachObjectLink, /* foreachIDLink */ foreachIDLink, + /* foreachTexLink */ foreachTexLink, }; |