griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

NLA strip option "Add" accidentally also added constraint ipo values.

Browse Source 
Result was characters going bezerk! By definition, pose blending now only
adds loc/rot/size, not constraint strength values.
This commit is contained in:
Ton Roosendaal
2005-07-24 13:30:44 +00:00
parent 4d273d8d5b
commit fcaaebb4f0
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -332,7 +332,6 @@ void blend_poses(bPose *dst, const bPose *src, float srcweight, short mode)
schan= src->chanbase.first;
for (dchan = dst->chanbase.first; dchan; dchan=dchan->next, schan= schan->next){
if (schan->flag & (POSE_ROT|POSE_LOC|POSE_SIZE)) {
/* replaced quat->matrix->quat conversion with decent quaternion interpol (ton) */
/* Do the transformation blend */
@@ -356,7 +355,8 @@ void blend_poses(bPose *dst, const bPose *src, float srcweight, short mode)
dchan->flag |= schan->flag;
}
for(dcon= dchan->constraints.first, scon= schan->constraints.first; dcon && scon; dcon= dcon->next, scon= scon->next) {
dcon->enforce= dcon->enforce*dstweight + scon->enforce*srcweight;
/* no 'add' option for constraint blending */
dcon->enforce= dcon->enforce*(1.0f-srcweight) + scon->enforce*srcweight;
}
}
}