Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2008-01-02 21:44:13 +0300
committerCampbell Barton <ideasman42@gmail.com>2008-01-02 21:44:13 +0300
commit861d5e57a5ac1d803ca80f5cd1b361fb03e90410 (patch)
treeed48f3f4a33a7c2fe7ca7c233dfb9042ebfad311 /source/blender/blenloader/intern
parent2c6e0f5ab24e144d871ef90305dcb85d63b16fa4 (diff)
displace modifier wasnt loading in linked textures/objects. missing calls to expand_doit
Diffstat (limited to 'source/blender/blenloader/intern')
-rw-r--r--source/blender/blenloader/intern/readfile.c6
1 files changed, 6 insertions, 0 deletions
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)