Revision: 21428
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21428
Author:   campbellbarton
Date:     2009-07-08 16:32:03 +0200 (Wed, 08 Jul 2009)

Log Message:
-----------
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.

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c

Modified: 
branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c     
2009-07-08 14:26:43 UTC (rev 21427)
+++ branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c     
2009-07-08 14:32:03 UTC (rev 21428)
@@ -9086,7 +9086,7 @@
                                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;


_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to