Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

code cleanup: quiet double promotion warnings

Browse Source
This commit is contained in:
Campbell Barton
2012-11-07 23:52:33 +00:00
parent c0fb605a04
commit 353ad46e10
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
intern/cycles/device/device_task.cpp
View File

@@ -101,7 +101,7 @@ void DeviceTask::update_progress(RenderTile &rtile)
if(update_tile_sample) { if(update_tile_sample) {
double current_time = time_dt(); 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); update_tile_sample(rtile);
last_update_time = current_time; last_update_time = current_time;

2
intern/cycles/kernel/svm/svm_geometry.h
View File

@@ -34,7 +34,7 @@ __device void svm_node_geometry(KernelGlobals *kg, ShaderData *sd, float *stack,
if(attr_offset != ATTR_STD_NOT_FOUND) { if(attr_offset != ATTR_STD_NOT_FOUND) {
data = triangle_attribute_float3(kg, sd, ATTR_ELEMENT_VERTEX, attr_offset, NULL, NULL); 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); object_normal_transform(kg, sd, &data);
data = cross(sd->N, normalize(cross(data, sd->N)));; data = cross(sd->N, normalize(cross(data, sd->N)));;
} }

2
intern/cycles/render/session.cpp
View File

@@ -818,7 +818,7 @@ bool Session::update_progressive_refine(bool cancel)
double current_time = time_dt(); 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 last sample was processed, we need to write buffers anyway */
if (!write) if (!write)
return false; return false;