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

[Campbell Barton]

Revision: 51991
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51991
Author:   campbellbarton
Date:     2012-11-07 23:52:33 +0000 (Wed, 07 Nov 2012)
Log Message:
-----------
code cleanup: quiet double promotion warnings

Modified Paths:
--------------
    trunk/blender/intern/cycles/device/device_task.cpp
    trunk/blender/intern/cycles/kernel/svm/svm_geometry.h
    trunk/blender/intern/cycles/render/session.cpp

Modified: trunk/blender/intern/cycles/device/device_task.cpp
===================================================================
--- trunk/blender/intern/cycles/device/device_task.cpp	2012-11-07 22:39:47 UTC (rev 51990)
+++ trunk/blender/intern/cycles/device/device_task.cpp	2012-11-07 23:52:33 UTC (rev 51991)
@@ -101,7 +101,7 @@
 	if(update_tile_sample) {
 		double current_time = time_dt();
 
-		if (current_time - last_update_time >= 1.0f) {
+		if (current_time - last_update_time >= 1.0) {
 			update_tile_sample(rtile);
 
 			last_update_time = current_time;

Modified: trunk/blender/intern/cycles/kernel/svm/svm_geometry.h
===================================================================
--- trunk/blender/intern/cycles/kernel/svm/svm_geometry.h	2012-11-07 22:39:47 UTC (rev 51990)
+++ trunk/blender/intern/cycles/kernel/svm/svm_geometry.h	2012-11-07 23:52:33 UTC (rev 51991)
@@ -34,7 +34,7 @@
 
 			if(attr_offset != ATTR_STD_NOT_FOUND) {
 				data = triangle_attribute_float3(kg, sd, ATTR_ELEMENT_VERTEX, attr_offset, NULL, NULL);
-				data = make_float3(-(data.y - 0.5), (data.x - 0.5), 0.0f);
+				data = make_float3(-(data.y - 0.5f), (data.x - 0.5f), 0.0f);
 				object_normal_transform(kg, sd, &data);
 				data = cross(sd->N, normalize(cross(data, sd->N)));;
 			}

Modified: trunk/blender/intern/cycles/render/session.cpp
===================================================================
--- trunk/blender/intern/cycles/render/session.cpp	2012-11-07 22:39:47 UTC (rev 51990)
+++ trunk/blender/intern/cycles/render/session.cpp	2012-11-07 23:52:33 UTC (rev 51991)
@@ -818,7 +818,7 @@
 
 	double current_time = time_dt();
 
-	if (current_time - last_update_time < 1.0f) {
+	if (current_time - last_update_time < 1.0) {
 		/* if last sample was processed, we need to write buffers anyway  */
 		if (!write)
 			return false;