From 83b0e975b92c7678376b83b468450f2be0af1bf3 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 20 Apr 2019 12:31:22 +0200 Subject: Cleanup: quiet warning for NULL pointer use Warning was false positive but avoid repeating the same check. --- source/blender/editors/transform/transform_conversions.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'source/blender/editors') diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index 4346decd4a7..4f288f56f8f 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -2934,20 +2934,24 @@ static void createTransEditVerts(TransInfo *t) } /* CrazySpace */ - if (defmats || (quats && BM_elem_flag_test(eve, BM_ELEM_TAG))) { + const bool use_quats = quats && BM_elem_flag_test(eve, BM_ELEM_TAG); + if (use_quats || defmats) { float mat[3][3], qmat[3][3], imat[3][3]; - /* use both or either quat and defmat correction */ - if (quats && BM_elem_flag_test(eve, BM_ELEM_TAG)) { + /* Use both or either quat and defmat correction. */ + if (use_quats) { quat_to_mat3(qmat, quats[BM_elem_index_get(eve)]); - if (defmats) + if (defmats) { mul_m3_series(mat, defmats[a], qmat, mtx); - else + } + else { mul_m3_m3m3(mat, mtx, qmat); + } } - else + else { mul_m3_m3m3(mat, mtx, defmats[a]); + } invert_m3_m3(imat, mat); -- cgit v1.2.3