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-27 15:18:54 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-10-27 15:18:54 +0400
commit9fc95bd7ee2aed9d4de7c3c05dfef6597b83a332 (patch)
treea93569a6068e176cd68d859e880a3124da37d7dd /source/blender/blenlib/intern/voronoi.c
parentec67334e25b92c60f97978ef1bf754b4ba55127e (diff)
use min/max inline functions where MIN2/MAX2 were doing type conversion.
Diffstat (limited to 'source/blender/blenlib/intern/voronoi.c')
-rw-r--r--source/blender/blenlib/intern/voronoi.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenlib/intern/voronoi.c b/source/blender/blenlib/intern/voronoi.c
index 1a55dd26ce0..9674012a73d 100644
--- a/source/blender/blenlib/intern/voronoi.c
+++ b/source/blender/blenlib/intern/voronoi.c
@@ -490,9 +490,9 @@ static void voronoi_finishEdge(VoronoiProcess *process, VoronoiParabola *parabol
}
if (parabola->edge->direction[0] > 0.0f)
- mx = MAX2(process->width, parabola->edge->start[0] + 10);
+ mx = max_ff(process->width, parabola->edge->start[0] + 10);
else
- mx = MIN2(0.0, parabola->edge->start[0] - 10);
+ mx = min_ff(0.0f, parabola->edge->start[0] - 10.0f);
parabola->edge->end[0] = mx;
parabola->edge->end[1] = mx * parabola->edge->f + parabola->edge->g;