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

Bugfix #5617

Browse Source 
Armature deform bug: when values in weightgroups are extreme small but not
zero (like 10e-39) a division caused values to warp to infinity or beyond!
This commit is contained in:
Ton Roosendaal 2007-01-06 12:33:01 +00:00
parent 207e7bc2bd
commit 6c9b0288e5
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -652,13 +652,13 @@ void armature_deform_verts(Object *armOb, Object *target, DerivedMesh *dm,
{ {
bPoseChannel *pchan, **defnrToPC = NULL; bPoseChannel *pchan, **defnrToPC = NULL;
MDeformVert *dverts = NULL; MDeformVert *dverts = NULL;
bDeformGroup *dg;
float obinv[4][4], premat[4][4], postmat[4][4]; float obinv[4][4], premat[4][4], postmat[4][4];
int use_envelope = deformflag & ARM_DEF_ENVELOPE; int use_envelope = deformflag & ARM_DEF_ENVELOPE;
int numGroups = 0; /* safety for vertexgroup index overflow */ int numGroups = 0; /* safety for vertexgroup index overflow */
int i, target_totvert = 0; /* safety for vertexgroup overflow */ int i, target_totvert = 0; /* safety for vertexgroup overflow */
int use_dverts = 0; int use_dverts = 0;
int armature_def_nr = -1; int armature_def_nr = -1;
bDeformGroup *dg;
if(armOb == G.obedit) return; if(armOb == G.obedit) return;
@ -723,16 +723,13 @@ void armature_deform_verts(Object *armOb, Object *target, DerivedMesh *dm,
for(i = 0; i < numVerts; i++) { for(i = 0; i < numVerts; i++) {
MDeformVert *dvert; MDeformVert *dvert;
float *co = vertexCos[i]; float *co = vertexCos[i];
float vec[3]; float vec[3];
float contrib = 0.0; float contrib = 0.0f;
int j; float armature_weight = 1.0f; /* default to 1 if no overall def group */
float armature_weight = 1; /* default to 1 if no overall def group */ int j;
vec[0] = vec[1] = vec[2] = 0; vec[0] = vec[1] = vec[2] = 0.0f;
/* Apply the object's matrix */
Mat4MulVecfl(premat, co);
if(use_dverts || armature_def_nr >= 0) { if(use_dverts || armature_def_nr >= 0) {
if(dm) dvert = dm->getVertData(dm, i, CD_MDEFORMVERT); if(dm) dvert = dm->getVertData(dm, i, CD_MDEFORMVERT);
else if(i < target_totvert) dvert = dverts + i; else if(i < target_totvert) dvert = dverts + i;
@ -741,7 +738,7 @@ void armature_deform_verts(Object *armOb, Object *target, DerivedMesh *dm,
dvert = NULL; dvert = NULL;
if(armature_def_nr >= 0 && dvert) { if(armature_def_nr >= 0 && dvert) {
armature_weight = 0; /* a def group was given, so default to 0 */ armature_weight = 0.0f; /* a def group was given, so default to 0 */
for(j = 0; j < dvert->totweight; j++) { for(j = 0; j < dvert->totweight; j++) {
if(dvert->dw[j].def_nr == armature_def_nr) { if(dvert->dw[j].def_nr == armature_def_nr) {
armature_weight = dvert->dw[j].weight; armature_weight = dvert->dw[j].weight;
@ -751,7 +748,10 @@ void armature_deform_verts(Object *armOb, Object *target, DerivedMesh *dm,
} }
/* check if there's any point in calculating for this vert */ /* check if there's any point in calculating for this vert */
if(armature_weight == 0) continue; if(armature_weight == 0.0f) continue;
/* Apply the object's matrix */
Mat4MulVecfl(premat, co);
if(use_dverts && dvert && dvert->totweight) { // use weight groups ? if(use_dverts && dvert && dvert->totweight) { // use weight groups ?
int deformed = 0; int deformed = 0;
@ -762,7 +762,7 @@ void armature_deform_verts(Object *armOb, Object *target, DerivedMesh *dm,
if(pchan) { if(pchan) {
float weight = dvert->dw[j].weight; float weight = dvert->dw[j].weight;
Bone *bone = pchan->bone; Bone *bone = pchan->bone;
deformed = 1; deformed = 1;
if(bone && bone->flag & BONE_MULT_VG_ENV) { if(bone && bone->flag & BONE_MULT_VG_ENV) {
@ -794,10 +794,12 @@ void armature_deform_verts(Object *armOb, Object *target, DerivedMesh *dm,
} }
} }
if(contrib > 0.0) /* actually should be EPSILON. weight values and contrib can be like 10e-39 small */
if(contrib > 0.01f) {
VecMulf(vec, armature_weight / contrib); VecMulf(vec, armature_weight / contrib);
VecAddf(co, vec, co);
VecAddf(co, vec, co); }
/* always, check above code */
Mat4MulVecfl(postmat, co); Mat4MulVecfl(postmat, co);
} }