diff options
author | Campbell Barton <ideasman42@gmail.com> | 2008-01-02 21:44:13 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2008-01-02 21:44:13 +0300 |
commit | 861d5e57a5ac1d803ca80f5cd1b361fb03e90410 (patch) | |
tree | ed48f3f4a33a7c2fe7ca7c233dfb9042ebfad311 /source | |
parent | 2c6e0f5ab24e144d871ef90305dcb85d63b16fa4 (diff) |
displace modifier wasnt loading in linked textures/objects. missing calls to expand_doit
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/blenkernel/intern/modifier.c | 2 | ||||
-rw-r--r-- | source/blender/blenloader/intern/readfile.c | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c index fc8b14b8d4c..faaeeacbc5e 100644 --- a/source/blender/blenkernel/intern/modifier.c +++ b/source/blender/blenkernel/intern/modifier.c @@ -2724,7 +2724,7 @@ static void displaceModifier_foreachIDLink(ModifierData *md, Object *ob, { DisplaceModifierData *dmd = (DisplaceModifierData*) md; - walk(userData, ob, (ID **)&dmd->texture); + walk(userData, ob, &dmd->texture); displaceModifier_foreachObjectLink(md, ob, (ObjectWalkFunc) walk, userData); } diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 6381aec7872..fb7388417f2 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -7867,6 +7867,12 @@ static void expand_modifier(FileData *fd, Main *mainvar, ModifierData *md) expand_doit(fd, mainvar, mmd->mirror_ob); } + else if (md->type==eModifierType_Displace) { + DisplaceModifierData *dmd = (DisplaceModifierData*) md; + + expand_doit(fd, mainvar, dmd->map_object); + expand_doit(fd, mainvar, dmd->texture); + } } static void expand_scriptlink(FileData *fd, Main *mainvar, ScriptLink *slink) |