diff --git a/source/blender/blenlib/intern/math_geom_inline.cc b/source/blender/blenlib/intern/math_geom_inline.cc index 9686cd42881..2add0b8fce0 100644 --- a/source/blender/blenlib/intern/math_geom_inline.cc +++ b/source/blender/blenlib/intern/math_geom_inline.cc @@ -129,25 +129,25 @@ MINLINE float shell_angle_to_dist(const float angle) } MINLINE float shell_v3v3_normalized_to_dist(const float a[3], const float b[3]) { - const float angle_cos = fabsf(dot_v3v3(a, b)); BLI_ASSERT_UNIT_V3(a); BLI_ASSERT_UNIT_V3(b); + const float angle_cos = fabsf(dot_v3v3(a, b)); return (UNLIKELY(angle_cos < SMALL_NUMBER)) ? 1.0f : (1.0f / angle_cos); } MINLINE float shell_v2v2_normalized_to_dist(const float a[2], const float b[2]) { - const float angle_cos = fabsf(dot_v2v2(a, b)); BLI_ASSERT_UNIT_V2(a); BLI_ASSERT_UNIT_V2(b); + const float angle_cos = fabsf(dot_v2v2(a, b)); return (UNLIKELY(angle_cos < SMALL_NUMBER)) ? 1.0f : (1.0f / angle_cos); } MINLINE float shell_v3v3_mid_normalized_to_dist(const float a[3], const float b[3]) { - float angle_cos; - float ab[3]; BLI_ASSERT_UNIT_V3(a); BLI_ASSERT_UNIT_V3(b); + float angle_cos; + float ab[3]; add_v3_v3v3(ab, a, b); angle_cos = (normalize_v3(ab) != 0.0f) ? fabsf(dot_v3v3(a, ab)) : 0.0f; return (UNLIKELY(angle_cos < SMALL_NUMBER)) ? 1.0f : (1.0f / angle_cos); @@ -155,10 +155,10 @@ MINLINE float shell_v3v3_mid_normalized_to_dist(const float a[3], const float b[ MINLINE float shell_v2v2_mid_normalized_to_dist(const float a[2], const float b[2]) { - float angle_cos; - float ab[2]; BLI_ASSERT_UNIT_V2(a); BLI_ASSERT_UNIT_V2(b); + float angle_cos; + float ab[2]; add_v2_v2v2(ab, a, b); angle_cos = (normalize_v2(ab) != 0.0f) ? fabsf(dot_v2v2(a, ab)) : 0.0f; return (UNLIKELY(angle_cos < SMALL_NUMBER)) ? 1.0f : (1.0f / angle_cos);