[Bf-blender-cvs] [8003f06] master: Compiler warnings: quiet float/double conversion warning

Campbell Barton noreply at git.blender.org
Thu Dec 5 00:35:06 CET 2013


Commit: 8003f0606d934be957981415fabd6401e9a99fcb
Author: Campbell Barton
Date:   Thu Dec 5 10:34:30 2013 +1100
http://developer.blender.org/rB8003f0606d934be957981415fabd6401e9a99fcb

Compiler warnings: quiet float/double conversion warning

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

M	source/blender/blenlib/intern/math_geom.c

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

diff --git a/source/blender/blenlib/intern/math_geom.c b/source/blender/blenlib/intern/math_geom.c
index c4c0adf..aefdc6d 100644
--- a/source/blender/blenlib/intern/math_geom.c
+++ b/source/blender/blenlib/intern/math_geom.c
@@ -2759,10 +2759,10 @@ void resolve_quad_uv_deriv(float r_uv[2], float r_deriv[2][2],
 
 		if (!IS_ZERO(denom)) {
 			double inv_denom = 1.0 / denom;
-			r_deriv[0][0] = -t[1] * inv_denom;
-			r_deriv[0][1] =  t[0] * inv_denom;
-			r_deriv[1][0] =  s[1] * inv_denom;
-			r_deriv[1][1] = -s[0] * inv_denom;
+			r_deriv[0][0] = (double)-t[1] * inv_denom;
+			r_deriv[0][1] = (double) t[0] * inv_denom;
+			r_deriv[1][0] = (double) s[1] * inv_denom;
+			r_deriv[1][1] = (double)-s[0] * inv_denom;
 		}
 	}
 }




More information about the Bf-blender-cvs mailing list