diff options
| -rw-r--r-- | source/blender/blenkernel/intern/tracking_stabilize.c | 4 | ||||
| -rw-r--r-- | source/blender/blenlib/BLI_math_matrix.h | 2 | ||||
| -rw-r--r-- | source/blender/blenlib/intern/math_matrix.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/uvedit/uvedit_parametrizer.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/tracking_stabilize.c b/source/blender/blenkernel/intern/tracking_stabilize.c index 89537b3f788..32e7233060c 100644 --- a/source/blender/blenkernel/intern/tracking_stabilize.c +++ b/source/blender/blenkernel/intern/tracking_stabilize.c @@ -476,7 +476,7 @@ static float rotation_contribution(TrackStabilizationBase *track_ref, sub_v2_v2v2(pos, marker->pos, pivot); pos[0] *= aspect; - mul_m2v2(track_ref->stabilization_rotation_base, pos); + mul_m2_v2(track_ref->stabilization_rotation_base, pos); *result_angle = atan2f(pos[1], pos[0]); @@ -516,7 +516,7 @@ static void compensate_rotation_center(const int size, copy_v2_v2(rotated_pivot, pivot); angle_to_mat2(rotation_mat, +angle); sub_v2_v2(rotated_pivot, origin); - mul_m2v2(rotation_mat, rotated_pivot); + mul_m2_v2(rotation_mat, rotated_pivot); mul_v2_fl(rotated_pivot, scale); add_v2_v2(rotated_pivot, origin); add_v2_v2(result_translation, intended_pivot); diff --git a/source/blender/blenlib/BLI_math_matrix.h b/source/blender/blenlib/BLI_math_matrix.h index acefe18fd40..73731255882 100644 --- a/source/blender/blenlib/BLI_math_matrix.h +++ b/source/blender/blenlib/BLI_math_matrix.h @@ -188,7 +188,7 @@ void mul_v3_m4v3_db(double r[3], const double mat[4][4], const double vec[3]); void mul_v4_m4v3_db(double r[4], const double mat[4][4], const double vec[3]); void mul_v2_m4v3(float r[2], const float M[4][4], const float v[3]); void mul_v2_m2v2(float r[2], const float M[2][2], const float v[2]); -void mul_m2v2(const float M[2][2], float v[2]); +void mul_m2_v2(const float M[2][2], float v[2]); void mul_mat3_m4_v3(const float M[4][4], float r[3]); void mul_v3_mat3_m4v3(float r[3], const float M[4][4], const float v[3]); void mul_v3_mat3_m4v3_db(double r[3], const double M[4][4], const double v[3]); diff --git a/source/blender/blenlib/intern/math_matrix.c b/source/blender/blenlib/intern/math_matrix.c index 86a08a42247..efc754acab1 100644 --- a/source/blender/blenlib/intern/math_matrix.c +++ b/source/blender/blenlib/intern/math_matrix.c @@ -744,7 +744,7 @@ void mul_v2_m2v2(float r[2], const float mat[2][2], const float vec[2]) r[1] = mat[0][1] * x + mat[1][1] * vec[1]; } -void mul_m2v2(const float mat[2][2], float vec[2]) +void mul_m2_v2(const float mat[2][2], float vec[2]) { mul_v2_m2v2(vec, mat, vec); } diff --git a/source/blender/editors/uvedit/uvedit_parametrizer.c b/source/blender/editors/uvedit/uvedit_parametrizer.c index e4d73c2b229..91e8c36ea35 100644 --- a/source/blender/editors/uvedit/uvedit_parametrizer.c +++ b/source/blender/editors/uvedit/uvedit_parametrizer.c @@ -503,7 +503,7 @@ static void p_chart_uv_transform(PChart *chart, float mat[2][2]) PVert *v; for (v = chart->verts; v; v = v->nextlink) { - mul_m2v2(mat, v->uv); + mul_m2_v2(mat, v->uv); } } |