[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28981] trunk/blender/source/blender/ blenloader/intern/readfile.c: fix for recent commit " armature conversion to modifier" (armature->deformflag crash on doversion)

[Dalai Felinto]

Revision: 28981
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28981
Author:   dfelinto
Date:     2010-05-25 17:26:12 +0200 (Tue, 25 May 2010)

Log Message:
-----------
fix for recent commit "armature conversion to modifier" (armature->deformflag 
crash on doversion)
reported by Joerg Mueller (Nexyon)

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-05-25 
14:14:31 UTC (rev 28980)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c   2010-05-25 
15:26:12 UTC (rev 28981)
@@ -10877,14 +10877,15 @@
                /* parent type to modifier */
                for(ob = main->object.first; ob; ob = ob->id.next) {
                        if(ob->parent) {
-                               Object *parent= newlibadr(fd, lib, ob->parent);
+                               Object *parent= (Object *)newlibadr(fd, lib, 
ob->parent);
                                if(parent->type==OB_ARMATURE && 
ob->partype==PARSKEL) {
                                        ArmatureModifierData *amd;
+                                       bArmature *arm= (bArmature 
*)newlibadr(fd, lib, parent->data);
 
                                        amd = (ArmatureModifierData*) 
modifier_new(eModifierType_Armature);
                                        amd->object = ob->parent;
                                        BLI_addtail((ListBase*)&ob->modifiers, 
amd);
-                                       amd->deformflag= ((bArmature 
*)(parent->data))->deformflag;
+                                       amd->deformflag= arm->deformflag;
                                        ob->partype = PAROBJECT;
                                }
                                else if(parent->type==OB_LATTICE && 
ob->partype==PARSKEL) {


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs