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

Bugfix #18039

Browse Source 
Armature modifier didn't set amd->prevCos temp variable to NULL 
after freeing. Saving this in file will cause error or crash on
reading. Quite weird how it survived so long?
This commit is contained in:
Ton Roosendaal
2009-04-22 17:35:37 +00:00
parent 971cabc2d6
commit b22819f686
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenkernel/intern/modifier.c
View File

@@ -8846,8 +8846,10 @@ void modifier_freeTemporaryData(ModifierData *md)
if(md->type == eModifierType_Armature) { if(md->type == eModifierType_Armature) {
ArmatureModifierData *amd= (ArmatureModifierData*)md; ArmatureModifierData *amd= (ArmatureModifierData*)md;
if(amd->prevCos) if(amd->prevCos) {
MEM_freeN(amd->prevCos); MEM_freeN(amd->prevCos);
amd->prevCos= NULL;
}
} }
} }

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

@@ -3176,6 +3176,11 @@ static void direct_link_modifiers(FileData *fd, ListBase *lb)
smd->emCache = smd->mCache = 0; smd->emCache = smd->mCache = 0;
} }
else if (md->type==eModifierType_Armature) {
ArmatureModifierData *amd = (ArmatureModifierData*) md;
amd->prevCos= NULL;
}
else if (md->type==eModifierType_Cloth) { else if (md->type==eModifierType_Cloth) {
ClothModifierData *clmd = (ClothModifierData*) md; ClothModifierData *clmd = (ClothModifierData*) md;