svn merge -r 13357:13382 https://svn.blender.org/svnroot/bf-blender/trunk/blender
[blender.git] / source / blender / src / transform_conversions.c
index 5d2e7cd741054480e49e278f0011f3ea26e36d52..e69fabdd926db836560cb327c6f609724e14ba15 100644 (file)
@@ -561,7 +561,7 @@ static void add_pose_transdata(TransInfo *t, bPoseChannel *pchan, Object *ob, Tr
                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
@@ -570,7 +570,7 @@ static void add_pose_transdata(TransInfo *t, bPoseChannel *pchan, Object *ob, Tr
                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!