[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56862] trunk/blender/intern/cycles: code cleanup: double promotion warnings.

[Campbell Barton]

Revision: 56862
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56862
Author:   campbellbarton
Date:     2013-05-16 17:20:56 +0000 (Thu, 16 May 2013)
Log Message:
-----------
code cleanup: double promotion warnings.

Modified Paths:
--------------
    trunk/blender/intern/cycles/blender/blender_session.cpp
    trunk/blender/intern/cycles/kernel/kernel_bvh.h
    trunk/blender/intern/cycles/util/util_math.h

Modified: trunk/blender/intern/cycles/blender/blender_session.cpp
===================================================================
--- trunk/blender/intern/cycles/blender/blender_session.cpp	2013-05-16 15:59:05 UTC (rev 56861)
+++ trunk/blender/intern/cycles/blender/blender_session.cpp	2013-05-16 17:20:56 UTC (rev 56862)
@@ -518,7 +518,7 @@
 				start_resize_time = time_dt();
 				tag_redraw();
 			}
-			else if(time_dt() - start_resize_time < 0.2f) {
+			else if(time_dt() - start_resize_time < 0.2) {
 				tag_redraw();
 			}
 			else {

Modified: trunk/blender/intern/cycles/kernel/kernel_bvh.h
===================================================================
--- trunk/blender/intern/cycles/kernel/kernel_bvh.h	2013-05-16 15:59:05 UTC (rev 56861)
+++ trunk/blender/intern/cycles/kernel/kernel_bvh.h	2013-05-16 17:20:56 UTC (rev 56862)
@@ -470,9 +470,9 @@
 					float d0 = d - r_curr;
 					float d1 = d + r_curr;
 					if (d0 >= 0)
-						coverage = (min(d1 / mw_extension, 1.0f) - min(d0 / mw_extension, 1.0f)) * 0.5;
+						coverage = (min(d1 / mw_extension, 1.0f) - min(d0 / mw_extension, 1.0f)) * 0.5f;
 					else // inside
-						coverage = (min(d1 / mw_extension, 1.0f) + min(-d0 / mw_extension, 1.0f)) * 0.5;
+						coverage = (min(d1 / mw_extension, 1.0f) + min(-d0 / mw_extension, 1.0f)) * 0.5f;
 				}
 				
 				if (p_curr.x * p_curr.x + p_curr.y * p_curr.y >= r_ext * r_ext || p_curr.z <= epsilon) {

Modified: trunk/blender/intern/cycles/util/util_math.h
===================================================================
--- trunk/blender/intern/cycles/util/util_math.h	2013-05-16 15:59:05 UTC (rev 56861)
+++ trunk/blender/intern/cycles/util/util_math.h	2013-05-16 17:20:56 UTC (rev 56862)
@@ -1130,7 +1130,7 @@
 {
 	/* GPU pow doesn't accept negative x, do manual checks here */
 	if(x < 0.0f) {
-		if(fmod(-y, 2.0f) == 0.0f)
+		if(fmodf(-y, 2.0f) == 0.0f)
 			return powf(-x, y);
 		else
 			return -powf(-x, y);