[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13359] trunk/blender/source/blender:

[Brecht Van Lommel]

Revision: 13359
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13359
Author:   blendix
Date:     2008-01-22 21:59:45 +0100 (Tue, 22 Jan 2008)

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

Bugfix for crazyspace correction of childof constraint on bones.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/constraint.c
    trunk/blender/source/blender/src/transform_conversions.c

Modified: trunk/blender/source/blender/blenkernel/intern/constraint.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/constraint.c	2008-01-22 20:35:37 UTC (rev 13358)
+++ trunk/blender/source/blender/blenkernel/intern/constraint.c	2008-01-22 20:59:45 UTC (rev 13359)
@@ -295,7 +295,7 @@
 	
 	/* calculate delta of constraints evaluation */
 	Mat4Invert(imat, cob->startmat);
-	Mat4MulMat4(delta, cob->matrix, imat);
+	Mat4MulMat4(delta, imat, cob->matrix);
 	
 	/* copy matrices back to source */
 	switch (cob->type) {

Modified: trunk/blender/source/blender/src/transform_conversions.c
===================================================================
--- trunk/blender/source/blender/src/transform_conversions.c	2008-01-22 20:35:37 UTC (rev 13358)
+++ trunk/blender/source/blender/src/transform_conversions.c	2008-01-22 20:59:45 UTC (rev 13359)
@@ -560,7 +560,7 @@
 		if (constraints_list_needinv(t, &pchan->constraints)) {
 			Mat3CpyMat4(tmat, pchan->constinv);
 			Mat3Inv(cmat, tmat);
-			Mat3MulSerie(td->mtx, pchan->bone->bone_mat, pmat, cmat, omat, 0,0,0,0);    // dang mulserie swaps args
+			Mat3MulSerie(td->mtx, pchan->bone->bone_mat, pmat, omat, cmat, 0,0,0,0);    // dang mulserie swaps args
 		}
 		else
 			Mat3MulSerie(td->mtx, pchan->bone->bone_mat, pmat, omat, 0,0,0,0,0);    // dang mulserie swaps args
@@ -569,7 +569,7 @@
 		if (constraints_list_needinv(t, &pchan->constraints)) {
 			Mat3CpyMat4(tmat, pchan->constinv);
 			Mat3Inv(cmat, tmat);
-			Mat3MulSerie(td->mtx, pchan->bone->bone_mat, cmat, omat, 0, 0,0,0,0);    // dang mulserie swaps args
+			Mat3MulSerie(td->mtx, pchan->bone->bone_mat, omat, cmat, 0,0,0,0,0);    // dang mulserie swaps args
 		}
 		else 
 			Mat3MulMat3(td->mtx, omat, pchan->bone->bone_mat);  // Mat3MulMat3 has swapped args!