Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2012-10-23 17:28:22 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-10-23 17:28:22 +0400
commitf70d2c65d85c6ad983b9155daedb0dff0c085e90 (patch)
tree726eb4833b6c45eaa372f779af50ae6b379c238e /source/blender/editors/interface/view2d_ops.c
parent9599c2a02b65864e014ec4713629c96c0662e31e (diff)
rename api functions...
- minf, maxf, mini, maxi --> min_ff, max_ff, min_ii, max_ii
Diffstat (limited to 'source/blender/editors/interface/view2d_ops.c')
-rw-r--r--source/blender/editors/interface/view2d_ops.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/editors/interface/view2d_ops.c b/source/blender/editors/interface/view2d_ops.c
index 87da31ceaee..48a1f8bf0f3 100644
--- a/source/blender/editors/interface/view2d_ops.c
+++ b/source/blender/editors/interface/view2d_ops.c
@@ -1243,16 +1243,16 @@ static float smooth_view_rect_to_fac(const rctf *rect_a, const rctf *rect_b)
for (i = 0; i < 2; i++) {
/* axis translation normalized to scale */
- tfac = fabsf(cent_a[i] - cent_b[i]) / minf(size_a[i], size_b[i]);
- fac_max = maxf(fac_max, tfac);
+ tfac = fabsf(cent_a[i] - cent_b[i]) / min_ff(size_a[i], size_b[i]);
+ fac_max = max_ff(fac_max, tfac);
if (fac_max >= 1.0f) break;
/* axis scale difference, x2 so doubling or half gives 1.0f */
- tfac = (1.0f - (minf(size_a[i], size_b[i]) / maxf(size_a[i], size_b[i]))) * 2.0f;
- fac_max = maxf(fac_max, tfac);
+ tfac = (1.0f - (min_ff(size_a[i], size_b[i]) / max_ff(size_a[i], size_b[i]))) * 2.0f;
+ fac_max = max_ff(fac_max, tfac);
if (fac_max >= 1.0f) break;
}
- return minf(fac_max, 1.0f);
+ return min_ff(fac_max, 1.0f);
}
/* will start timer if appropriate */