From a834007a9b9b7adca2e57bf6ff575524bee80804 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 1 Feb 2012 05:59:50 +0000 Subject: Previous fix for [#29484] wasn't working right (did work in report file though). this now shares code with RNA's 'pchan.matrix = matrix' tested with parent scale/rot/translation --- source/blender/blenkernel/intern/constraint.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'source/blender/blenkernel/intern/constraint.c') diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c index 571c6c631a9..59667743520 100644 --- a/source/blender/blenkernel/intern/constraint.c +++ b/source/blender/blenkernel/intern/constraint.c @@ -302,7 +302,8 @@ void constraint_mat_convertspace (Object *ob, bPoseChannel *pchan, float mat[][4 /* override with local location */ if ((pchan->parent) && (pchan->bone->flag & BONE_NO_LOCAL_LOCATION)) { - sub_v3_v3v3(mat[3], tempmat[3], pchan->bone->arm_mat[3]); + armature_mat_pose_to_bone_ex(ob, pchan, pchan->pose_mat, tempmat); + copy_v3_v3(mat[3], tempmat[3]); } } } -- cgit v1.2.3