sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Overflow was possible for vertex index numbers in deformgroups, causing

Browse Source 
the table with bones in deform code not to work. Added a check for amount
of Bones. (Orange bug!)
This commit is contained in:
Ton Roosendaal 2005-10-19 11:15:36 +00:00
parent 4d2c0d3ef1
commit b83f3183c0
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/blenkernel/intern/armature.c
View File

@ -667,6 +667,7 @@ void armature_deform_verts(Object *armOb, Object *target, float (*vertexCos)[3],
MDeformVert *dverts= NULL;
float obinv[4][4], premat[4][4], postmat[4][4];
int use_envelope= arm->deformflag & ARM_DEF_ENVELOPE;
int numGroups= 0; /* safety for vertexgroup index overflow too */
int i;
Mat4Invert(obinv, target->obmat);
@ -687,9 +688,10 @@ void armature_deform_verts(Object *armOb, Object *target, float (*vertexCos)[3],
/* get a vertex-deform-index to posechannel array */
if(arm->deformflag & ARM_DEF_VGROUP) {
if (target->type==OB_MESH){
int numGroups = BLI_countlist(&target->defbase);
bDeformGroup *dg;
numGroups = BLI_countlist(&target->defbase);
dverts = ((Mesh*)target->data)->dvert;
if(dverts) {
defnrToPC = MEM_callocN(sizeof(*defnrToPC)*numGroups, "defnrToBone");
@ -726,7 +728,8 @@ void armature_deform_verts(Object *armOb, Object *target, float (*vertexCos)[3],
int deformed= 0;
for (j=0; j<dvert->totweight; j++){
pchan = defnrToPC[dvert->dw[j].def_nr];
int index= dvert->dw[j].def_nr;
pchan = index<numGroups?defnrToPC[index]:NULL;
if (pchan) {
float weight= dvert->dw[j].weight;
Bone *bone= pchan->bone;