Merge branch 'master' into blender2.8

[blender.git] / source / blender / blenlib / intern / math_geom.c

diff --git a/source/blender/blenlib/intern/math_geom.c b/source/blender/blenlib/intern/math_geom.c
index f8af6c20ae5cef074cd215645aa84f6e1187bdd6..b89647d5b9bc5f254c063585f48448e20beef7e6 100644 (file)
--- a/source/blender/blenlib/intern/math_geom.c
+++ b/source/blender/blenlib/intern/math_geom.c
@@ -3953,11 +3953,11 @@ void resolve_quad_uv_v2_deriv(float r_uv[2], float r_deriv[2][2],
 
        if (r_deriv) {
                float tmp1[2], tmp2[2], s[2], t[2];
-               
+
                /* clear outputs */
                zero_v2(r_deriv[0]);
                zero_v2(r_deriv[1]);
-               
+
                sub_v2_v2v2(tmp1, st1, st0);
                sub_v2_v2v2(tmp2, st2, st3);
                interp_v2_v2v2(s, tmp1, tmp2, r_uv[1]);
@@ -5246,7 +5246,7 @@ float cubic_tangent_factor_circle_v3(const float tan_l[3], const float tan_r[3])
 
        /* -7f causes instability/glitches with Bendy Bones + Custom Refs  */
        const float eps = 1e-5f;
-       
+
        const float tan_dot = dot_v3v3(tan_l, tan_r);
        if (tan_dot > 1.0f - eps) {
                /* no angle difference (use fallback, length wont make any difference) */