diff options
author | Campbell Barton <ideasman42@gmail.com> | 2017-08-30 11:13:25 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2017-08-30 11:13:25 +0300 |
commit | 998947360b4c958b6d2176afab3de15f2a13d825 (patch) | |
tree | 1e92a3ebfe971796200016519ae5eb82309497c8 /source/blender/editors/manipulator_library | |
parent | 8b23549d479fab753ca11f4ebde5880c8a209878 (diff) |
Manipulator: remove inline matrix calculation
Diffstat (limited to 'source/blender/editors/manipulator_library')
-rw-r--r-- | source/blender/editors/manipulator_library/manipulator_library_utils.c | 21 |
1 files changed, 6 insertions, 15 deletions
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, ¶ms, mat); } /* rotate mouse in relation to the center and relocate it */ |