[Bf-blender-cvs] [4c92ad2] soc-2014-remesh: One more fix to make this compile on Linux.

Howard Trickey noreply at git.blender.org
Tue Jul 8 18:55:14 CEST 2014


Commit: 4c92ad2cfaabad492472e504e30845dc0d40fa62
Author: Howard Trickey
Date:   Tue Jul 8 12:39:37 2014 -0400
https://developer.blender.org/rB4c92ad2cfaabad492472e504e30845dc0d40fa62

One more fix to make this compile on Linux.

Needed to change min -> min_ff, max -> max_ff.

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

M	source/blender/modifiers/intern/MOD_quadremesh.c

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

diff --git a/source/blender/modifiers/intern/MOD_quadremesh.c b/source/blender/modifiers/intern/MOD_quadremesh.c
index d7f3011..51226fa 100644
--- a/source/blender/modifiers/intern/MOD_quadremesh.c
+++ b/source/blender/modifiers/intern/MOD_quadremesh.c
@@ -367,8 +367,8 @@ static void QuadRemeshModifier_do(
 		BLI_assert(dvert != NULL);
 		dv = dvert;
 		for (i = 0; i < numVerts; i++) {
-			mmin = min(mmin, sys->U_field[i]);
-			mmax = max(mmax, sys->U_field[i]);
+			mmin = min_ff(mmin, sys->U_field[i]);
+			mmax = max_ff(mmax, sys->U_field[i]);
 		}
 
 		for (i = 0; i < numVerts; i++) {




More information about the Bf-blender-cvs mailing list