archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

fix for recent commit "armature conversion to modifier" (armature->deformflag crash on doversion)

Browse Source 
reported by Joerg Mueller (Nexyon)
This commit is contained in:
Dalai Felinto
2010-05-25 15:26:12 +00:00
parent f7c4dd6d56
commit 13f1ce8bdc
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/blenloader/intern/readfile.c
View File

@@ -10877,14 +10877,15 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
/* 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) {