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

fix [#30051] Copy Scale constraint overrides Inherit Scale from parent

Browse Source 
space conversion in constraint code ignored inherit scale option.
This commit is contained in:
Campbell Barton
2012-02-02 08:04:06 +00:00
parent 38ad71f0fa
commit ab4dbc6d78
1 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
source/blender/blenkernel/intern/constraint.c
View File

@@ -287,8 +287,17 @@ void constraint_mat_convertspace (Object *ob, bPoseChannel *pchan, float mat[][4
invert_m4_m4(imat, diff_mat);
}
else {
if (pchan->bone->flag & BONE_NO_SCALE) {
float tmat[4][4];
copy_m4_m4(tmat, pchan->parent->pose_mat);
normalize_m4(tmat);
mult_m4_m4m4(diff_mat, tmat, offs_bone);
}
else {
mult_m4_m4m4(diff_mat, pchan->parent->pose_mat, offs_bone);
}
/* pose_mat = par_pose_mat * bone_mat * chan_mat */
mult_m4_m4m4(diff_mat, pchan->parent->pose_mat, offs_bone);
invert_m4_m4(imat, diff_mat);
}
}
@@ -348,7 +357,16 @@ void constraint_mat_convertspace (Object *ob, bPoseChannel *pchan, float mat[][4
}
else {
/* pose_mat = par_pose_mat * bone_mat * chan_mat */
mult_m4_m4m4(diff_mat, pchan->parent->pose_mat, offs_bone);
if (pchan->bone->flag & BONE_NO_SCALE) {
float tmat[4][4];
copy_m4_m4(tmat, pchan->parent->pose_mat);
normalize_m4(tmat);
mult_m4_m4m4(diff_mat, tmat, offs_bone);
}
else {
mult_m4_m4m4(diff_mat, pchan->parent->pose_mat, offs_bone);
}
copy_m4_m4(tempmat, mat);
mult_m4_m4m4(mat, diff_mat, tempmat);
}