Revision: 27762
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27762
Author: broken
Date: 2010-03-26 07:10:21 +0100 (Fri, 26 Mar 2010)
Log Message:
-----------
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!
Modified Paths:
--------------
trunk/blender/source/blender/blenloader/intern/readfile.c
Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c 2010-03-26
05:55:55 UTC (rev 27761)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c 2010-03-26
06:10:21 UTC (rev 27762)
@@ -9738,7 +9738,7 @@
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;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
