diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-11-08 03:52:33 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-11-08 03:52:33 +0400 |
| commit | 353ad46e105909a3c9217e24bcde0411da916fcc (patch) | |
| tree | dd5c8dfcfda6d64bc6c2a9dacd8c2418715f8d88 /intern | |
| parent | c0fb605a04d64d8efd5176ea1e7b217e7d2d768d (diff) | |
code cleanup: quiet double promotion warnings
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/device/device_task.cpp | 2 | ||||
| -rw-r--r-- | intern/cycles/kernel/svm/svm_geometry.h | 2 | ||||
| -rw-r--r-- | intern/cycles/render/session.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/intern/cycles/device/device_task.cpp b/intern/cycles/device/device_task.cpp index c85e182d629..b3f02deaf6f 100644 --- a/intern/cycles/device/device_task.cpp +++ b/intern/cycles/device/device_task.cpp @@ -101,7 +101,7 @@ void DeviceTask::update_progress(RenderTile &rtile) 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; diff --git a/intern/cycles/kernel/svm/svm_geometry.h b/intern/cycles/kernel/svm/svm_geometry.h index 68177493f4e..c4d03c1f948 100644 --- a/intern/cycles/kernel/svm/svm_geometry.h +++ b/intern/cycles/kernel/svm/svm_geometry.h @@ -34,7 +34,7 @@ __device void svm_node_geometry(KernelGlobals *kg, ShaderData *sd, float *stack, 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)));; } diff --git a/intern/cycles/render/session.cpp b/intern/cycles/render/session.cpp index 024af8dede8..7f6b43c1e00 100644 --- a/intern/cycles/render/session.cpp +++ b/intern/cycles/render/session.cpp @@ -818,7 +818,7 @@ bool Session::update_progressive_refine(bool cancel) 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; |