diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2009-07-08 18:32:03 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2009-07-08 18:32:03 +0400 |
| commit | 031ed0431c37703b672d4589f85a4caa69810f37 (patch) | |
| tree | e512a7233cdbc7f973bc155470447e16f55b1d45 /source | |
| parent | 41be132eb7d3a55d5c2dbd147a23b247f8f7ed76 (diff) | |
fix for loading YoFrankie levels in blender 2.5. Multires pointer was corrupt on linked meshes.
Note that the files didnt use multires so something odd is going on, but for now this stops the crash.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index fd86c436558..d816708f8a4 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -9086,7 +9086,7 @@ static void do_versions(FileData *fd, Library *lib, Main *main) void *olddata = ob->data; ob->data = me; - if(me && me->mr) { + if(me && me->id.lib==NULL && me->mr) { /* XXX - library meshes crash on loading most yoFrankie levels, the multires pointer gets invalid - Campbell */ MultiresLevel *lvl; ModifierData *md; MultiresModifierData *mmd; |