[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12252] trunk/blender/source/blender/ blenkernel/intern/armature.c:

[Brecht Van Lommel]

Revision: 12252
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12252
Author:   blendix
Date:     2007-10-11 01:36:58 +0200 (Thu, 11 Oct 2007)

Log Message:
-----------

Fix for error in recent b-bone rest pose commit.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/armature.c

Modified: trunk/blender/source/blender/blenkernel/intern/armature.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/armature.c	2007-10-10 23:34:40 UTC (rev 12251)
+++ trunk/blender/source/blender/blenkernel/intern/armature.c	2007-10-10 23:36:58 UTC (rev 12252)
@@ -467,9 +467,9 @@
 		
 		/* find the next roll to interpolate as well */
 		if(rest)
+			Mat4MulMat4(difmat, next->bone->arm_mat, imat);
+		else
 			Mat4MulMat4(difmat, next->pose_mat, imat);
-		else
-			Mat4MulMat4(difmat, next->bone->arm_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