Code cleanup: Add -Werror=float-conversion to Cycles

2014-05-03 07:22:14 +10:00
parent 43d5e54a79
commit 8d16869d83
21 changed files with 106 additions and 96 deletions
--- a/intern/cycles/device/device_cuda.cpp
+++ b/intern/cycles/device/device_cuda.cpp
@@ -1036,7 +1036,7 @@ public:
 						float scaling_factor = (float)target_update_frequency / (float)msec;

 						/* sync at earliest next sample and probably later */
-						sync_sample = (sample + 1) + sync_sample * ceil(scaling_factor);
+						sync_sample = (sample + 1) + sync_sample * (int)ceil(scaling_factor);

 						sync_sample = min(end_sample - 1, sync_sample); // make sure we sync the last sample always