From 1779452eb455434ae151fa150e028060ddcf1c26 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 1 Jul 2015 16:02:30 +1000 Subject: Cleanup: use swap math funcs --- source/blender/blenkernel/intern/fcurve.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'source/blender/blenkernel/intern/fcurve.c') diff --git a/source/blender/blenkernel/intern/fcurve.c b/source/blender/blenkernel/intern/fcurve.c index 6e58513e38e..09fbf392590 100644 --- a/source/blender/blenkernel/intern/fcurve.c +++ b/source/blender/blenkernel/intern/fcurve.c @@ -986,15 +986,12 @@ void sort_time_fcurve(FCurve *fcu) /* if either one of both of the points exceeds crosses over the keyframe time... */ if ( (bezt->vec[0][0] > bezt->vec[1][0]) && (bezt->vec[2][0] < bezt->vec[1][0]) ) { /* swap handles if they have switched sides for some reason */ - SWAP(float, bezt->vec[0][0], bezt->vec[2][0]); - SWAP(float, bezt->vec[0][1], bezt->vec[2][1]); + swap_v2_v2(bezt->vec[0], bezt->vec[2]); } else { /* clamp handles */ - if (bezt->vec[0][0] > bezt->vec[1][0]) - bezt->vec[0][0] = bezt->vec[1][0]; - if (bezt->vec[2][0] < bezt->vec[1][0]) - bezt->vec[2][0] = bezt->vec[1][0]; + CLAMP_MAX(bezt->vec[0][0], bezt->vec[1][0]); + CLAMP_MIN(bezt->vec[2][0], bezt->vec[1][0]); } } } -- cgit v1.2.3