[Bf-blender-cvs] [998947360b4] blender2.8: Manipulator: remove inline matrix calculation

[Campbell Barton]

Commit: 998947360b4c958b6d2176afab3de15f2a13d825
Author: Campbell Barton
Date:   Wed Aug 30 18:13:25 2017 +1000
Branches: blender2.8
https://developer.blender.org/rB998947360b4c958b6d2176afab3de15f2a13d825

Manipulator: remove inline matrix calculation

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

M       source/blender/editors/manipulator_library/manipulator_library_utils.c

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

diff --git 
a/source/blender/editors/manipulator_library/manipulator_library_utils.c 
b/source/blender/editors/manipulator_library/manipulator_library_utils.c
index d807ee07917..fb1d1f89626 100644
--- a/source/blender/editors/manipulator_library/manipulator_library_utils.c
+++ b/source/blender/editors/manipulator_library/manipulator_library_utils.c
@@ -174,22 +174,13 @@ bool manipulator_window_project_2d(
 {
        float mat[4][4];
        {
-               float matrix_basis_buf[4][4];
-               const void *matrix_basis;
-               if (mpr->type->matrix_basis_get) {
-                       mpr->type->matrix_basis_get(mpr, matrix_basis_buf);
-                       matrix_basis = &matrix_basis_buf[0][0];
-               }
-               else {
-                       matrix_basis = &mpr->matrix_basis[0][0];
-               }
-
-               if (use_offset) {
-                       mul_m4_series(mat, mpr->matrix_space, matrix_basis, 
mpr->matrix_offset);
-               }
-               else {
-                       mul_m4_series(mat, mpr->matrix_space, matrix_basis);
+               float mat_identity[4][4];
+               struct WM_ManipulatorMatrixParams params = {NULL};
+               if (use_offset == false) {
+                       unit_m4(mat_identity);
+                       params.matrix_offset = mat_identity;
                }
+               WM_manipulator_calc_matrix_final_params(mpr, &params, mat);
        }
 
        /* rotate mouse in relation to the center and relocate it */

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs