[Bf-blender-cvs] [2ec865035c3] blender2.8: Error in last commit

Campbell Barton noreply at git.blender.org
Wed Aug 9 14:54:16 CEST 2017


Commit: 2ec865035c3db5f7554ae3a0dd0c93559dee2a62
Author: Campbell Barton
Date:   Wed Aug 9 22:55:18 2017 +1000
Branches: blender2.8
https://developer.blender.org/rB2ec865035c3db5f7554ae3a0dd0c93559dee2a62

Error in last commit

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

M	source/blender/windowmanager/manipulators/intern/wm_manipulator.c

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

diff --git a/source/blender/windowmanager/manipulators/intern/wm_manipulator.c b/source/blender/windowmanager/manipulators/intern/wm_manipulator.c
index 3e6e851c6e0..ba2146768ed 100644
--- a/source/blender/windowmanager/manipulators/intern/wm_manipulator.c
+++ b/source/blender/windowmanager/manipulators/intern/wm_manipulator.c
@@ -531,7 +531,7 @@ void WM_manipulator_calc_matrix_final_params(
 		mul_mat3_m4_fl(final_matrix, *scale_final);
 	}
 
-	mul_m4_m4m4(r_mat, final_matrix, matrix_space);
+	mul_m4_m4m4(r_mat, matrix_space, final_matrix);
 }
 
 void WM_manipulator_calc_matrix_final(const wmManipulator *mpr, float r_mat[4][4])




More information about the Bf-blender-cvs mailing list