diff options
| author | Matt Ebb <matt@mke3.net> | 2010-03-26 09:10:21 +0300 |
|---|---|---|
| committer | Matt Ebb <matt@mke3.net> | 2010-03-26 09:10:21 +0300 |
| commit | 38141895e959739b5a0100ebba3b4fd451da01bb (patch) | |
| tree | ff508dc3ddf924700c614f9b0f4b94f119e5cf2f /source/blender/blenloader | |
| parent | 50a49f2e0a1fae39cdd88e6c17fd2d5d2d3711d3 (diff) | |
Fix [#21745] file that opens in 2.4* crashes 2.5 while trying to open
Only convert old multires data to multires modifier if there are actually subdivisions stored.
Patch by Elia Sarti, thanks!
Diffstat (limited to 'source/blender/blenloader')
| -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 19bb72a2d82..5bcf7806a49 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -9738,7 +9738,7 @@ static void do_versions(FileData *fd, Library *lib, Main *main) void *olddata = ob->data; ob->data = me; - if(me && me->id.lib==NULL && me->mr) /* XXX - library meshes crash on loading most yoFrankie levels, the multires pointer gets invalid - Campbell */ + if(me && me->id.lib==NULL && me->mr && me->mr->level_count > 1) /* XXX - library meshes crash on loading most yoFrankie levels, the multires pointer gets invalid - Campbell */ multires_load_old(ob, me); ob->data = olddata; |