Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2007-10-11 03:36:58 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2007-10-11 03:36:58 +0400
commit4f961081377ce262823fd4a037ce969fc5088474 (patch)
treeff9a1c01d5e1ee2309a4944e554bcc2051572d78 /source
parent4a43099c5a61f302654b7f309572505894357227 (diff)
Fix for error in recent b-bone rest pose commit.
Diffstat (limited to 'source')
-rw-r--r--source/blender/blenkernel/intern/armature.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c
index 15e45dfd01f..c8e6648b3d1 100644
--- a/source/blender/blenkernel/intern/armature.c
+++ b/source/blender/blenkernel/intern/armature.c
@@ -467,9 +467,9 @@ Mat4 *b_bone_spline_setup(bPoseChannel *pchan, int rest)
/* find the next roll to interpolate as well */
if(rest)
- Mat4MulMat4(difmat, next->pose_mat, imat);
- else
Mat4MulMat4(difmat, next->bone->arm_mat, imat);
+ else
+ Mat4MulMat4(difmat, next->pose_mat, imat);
Mat3CpyMat4(result, difmat); // the desired rotation at beginning of next bone
vec_roll_to_mat3(h2, 0.0f, mat3); // the result of vec_roll without roll