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

apply envelope to weigh group didnt take armature scale into account

Browse Source
This commit is contained in:
Campbell Barton 2007-09-01 20:27:50 +00:00
parent 0170c66dd5
commit 5d39b806f9
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
source/blender/src/editarmature.c
View File

@ -2488,7 +2488,7 @@ static void add_vgroups__mapFunc(void *userData, int index, float *co, float *no
VECCOPY(verts[index], co); VECCOPY(verts[index], co);
} }
static void envelope_bone_weighting(Object *ob, Mesh *mesh, float (*verts)[3], int numbones, Bone **bonelist, bDeformGroup **dgrouplist, bDeformGroup **dgroupflip, float (*root)[3], float (*tip)[3], int *selected) static void envelope_bone_weighting(Object *ob, Mesh *mesh, float (*verts)[3], int numbones, Bone **bonelist, bDeformGroup **dgrouplist, bDeformGroup **dgroupflip, float (*root)[3], float (*tip)[3], int *selected, float scale)
{ {
/* Create vertex group weights from envelopes */ /* Create vertex group weights from envelopes */
@ -2511,7 +2511,7 @@ static void envelope_bone_weighting(Object *ob, Mesh *mesh, float (*verts)[3], i
/* store the distance-factor from the vertex to the bone */ /* store the distance-factor from the vertex to the bone */
distance = distfactor_to_bone (verts[i], root[j], tip[j], distance = distfactor_to_bone (verts[i], root[j], tip[j],
bone->rad_head, bone->rad_tail, bone->dist); bone->rad_head * scale, bone->rad_tail * scale, bone->dist * scale);
/* add the vert to the deform group if weight!=0.0 */ /* add the vert to the deform group if weight!=0.0 */
if (distance!=0.0) if (distance!=0.0)
@ -2653,13 +2653,22 @@ void add_verts_to_dgroups(Object *ob, Object *par, int heat, int mirror)
} }
/* compute the weights based on gathered vertices and bones */ /* compute the weights based on gathered vertices and bones */
if (heat) if (heat) {
heat_bone_weighting(ob, mesh, verts, numbones, dgrouplist, dgroupflip, heat_bone_weighting(ob, mesh, verts, numbones, dgrouplist, dgroupflip,
root, tip, selected); root, tip, selected);
else } else {
float scale;
float tmp[3] = {1.0, 1.0, 1.0};
float mat[3][3];
/* scale value from matrix, wont account for non uniform scale but ok */
Mat3CpyMat4(mat, par->obmat);
Mat3MulVecfl(mat, tmp);
scale = (fabs(tmp[0]) + fabs(tmp[1]) + fabs(tmp[2])) / 3.0f;
envelope_bone_weighting(ob, mesh, verts, numbones, bonelist, dgrouplist, envelope_bone_weighting(ob, mesh, verts, numbones, bonelist, dgrouplist,
dgroupflip, root, tip, selected); dgroupflip, root, tip, selected, scale);
}
/* free the memory allocated */ /* free the memory allocated */
MEM_freeN(bonelist); MEM_freeN(bonelist);
MEM_freeN(dgrouplist); MEM_freeN(dgrouplist);