[Bf-blender-cvs] [a5467637f29] blender2.8: Cleanup: use mul_m3_series

Campbell Barton noreply at git.blender.org
Thu Oct 18 03:06:30 CEST 2018


Commit: a5467637f29f46be506ffe930a66437d05064000
Author: Campbell Barton
Date:   Thu Oct 18 11:45:21 2018 +1100
Branches: blender2.8
https://developer.blender.org/rBa5467637f29f46be506ffe930a66437d05064000

Cleanup: use mul_m3_series

===================================================================

M	source/blender/editors/transform/transform.c

===================================================================

diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c
index ec689808ce3..d5f0502f8bc 100644
--- a/source/blender/editors/transform/transform.c
+++ b/source/blender/editors/transform/transform.c
@@ -3467,8 +3467,7 @@ static void applyShear(TransInfo *t, const int UNUSED(mval[2]))
 	cross_v3_v3v3(axismat_inv[1], axismat_inv[0], axismat_inv[2]);
 	invert_m3_m3(axismat, axismat_inv);
 
-	mul_m3_m3m3(tmat, smat, axismat);
-	mul_m3_m3m3(totmat, axismat_inv, tmat);
+	mul_m3_series(totmat, axismat_inv, smat, axismat);
 
 	FOREACH_TRANS_DATA_CONTAINER (t, tc) {
 		TransData *td = tc->data;
@@ -3482,9 +3481,7 @@ static void applyShear(TransInfo *t, const int UNUSED(mval[2]))
 				continue;
 
 			if (t->flag & T_EDIT) {
-				float mat3[3][3];
-				mul_m3_m3m3(mat3, totmat, td->mtx);
-				mul_m3_m3m3(tmat, td->smtx, mat3);
+				mul_m3_series(tmat, td->smtx, totmat, td->mtx);
 			}
 			else {
 				copy_m3_m3(tmat, totmat);



More information about the Bf-blender-cvs mailing list