griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

displace modifier wasnt loading in linked textures/objects. missing calls to expand_doit

Browse Source
This commit is contained in:
Campbell Barton
2008-01-02 18:44:13 +00:00
parent 2c6e0f5ab2
commit 861d5e57a5
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/intern/modifier.c
View File

@@ -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);
}

6
source/blender/blenloader/intern/readfile.c
View File

@@ -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)