[Bf-blender-cvs] [ea85e2fad30] HMD_viewport: Use max_ff

[Campbell Barton]

Commit: ea85e2fad302a2c2db5fc56958c2b2b3401772df
Author: Campbell Barton
Date:   Mon Apr 3 02:03:20 2017 +1000
Branches: HMD_viewport
https://developer.blender.org/rBea85e2fad302a2c2db5fc56958c2b2b3401772df

Use max_ff

===================================================================

M	source/blender/gpu/intern/gpu_compositing.c

===================================================================

diff --git a/source/blender/gpu/intern/gpu_compositing.c b/source/blender/gpu/intern/gpu_compositing.c
index d65af07511f..9d34327ca55 100644
--- a/source/blender/gpu/intern/gpu_compositing.c
+++ b/source/blender/gpu/intern/gpu_compositing.c
@@ -1313,7 +1313,7 @@ bool GPU_fx_do_composite_pass(
 			distparams->left_lens_center[0] = distparams->viewport_scale[0] - distparams->sep/2.0f;
 			distparams->right_lens_center[0] = distparams->sep/2.0f;
 			//asume calibration was for lens view to which ever edge of screen is further away from lens center
-			float warp_scale = (distparams->left_lens_center[0] > distparams->right_lens_center[0]) ? distparams->left_lens_center[0] : distparams->right_lens_center[0];
+			const float warp_scale = max_ff(distparams->left_lens_center[0], distparams->right_lens_center[0]);
 
 			const int color_uniform = GPU_shader_get_uniform(lensdist_shader, "warpTexture");
 			const int viewport_scale = GPU_shader_get_uniform(lensdist_shader, "ViewportScale");