diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-12-21 09:07:26 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-12-21 09:07:26 +0400 |
| commit | b2c66e268f68ee406e5e05a65d9d1609b65d20c4 (patch) | |
| tree | 722192b9fe1d7af57695860fc3639781bedf5f2b /source/blender/gpu/intern | |
| parent | e09ddf0d4ba6f6d1e8963d41eef153dadce482f8 (diff) | |
replace MIN/MAX 3,4 with inline functions
Diffstat (limited to 'source/blender/gpu/intern')
| -rw-r--r-- | source/blender/gpu/intern/gpu_draw.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/gpu/intern/gpu_draw.c b/source/blender/gpu/intern/gpu_draw.c index 4b04ee9224a..07462302700 100644 --- a/source/blender/gpu/intern/gpu_draw.c +++ b/source/blender/gpu/intern/gpu_draw.c @@ -101,9 +101,9 @@ void GPU_render_text(MTFace *tface, int mode, float line_start= 0.0f, line_height; if (v4) - line_height= MAX4(v1[1], v2[1], v3[1], v4[2]) - MIN4(v1[1], v2[1], v3[1], v4[2]); + line_height = max_ffff(v1[1], v2[1], v3[1], v4[2]) - min_ffff(v1[1], v2[1], v3[1], v4[2]); else - line_height= MAX3(v1[1], v2[1], v3[1]) - MIN3(v1[1], v2[1], v3[1]); + line_height = max_fff(v1[1], v2[1], v3[1]) - min_fff(v1[1], v2[1], v3[1]); line_height *= 1.2f; /* could be an option? */ /* end multiline */ |