sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

code cleanup: double promotion warnings.

Browse Source
This commit is contained in:
Campbell Barton 2013-05-16 17:20:56 +00:00
parent 34ba69d576
commit f334df5624
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
intern/cycles/blender/blender_session.cpp
View File

@ -518,7 +518,7 @@ bool BlenderSession::draw(int w, int h)
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 {

4
intern/cycles/kernel/kernel_bvh.h
View File

@ -470,9 +470,9 @@ __device_inline void bvh_cardinal_curve_intersect(KernelGlobals *kg, Intersectio
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) {

2
intern/cycles/util/util_math.h
View File

@ -1130,7 +1130,7 @@ __device float compatible_powf(float x, float y)
{
/* 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);