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

Fix T41839, OpenCL error.

Browse Source 
Also some style fixes, we don't do the "put as much as possible in 1 line" contest.
This commit is contained in:
Thomas Dinges
2014-09-15 14:22:39 +02:00
parent e5adeed40b
commit 03ce9882af
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1418,10 +1418,12 @@ ccl_device bool map_to_sphere(float *r_u, float *r_v,
const float x, const float y, const float z) const float x, const float y, const float z)
{ {
float len = sqrtf(x * x + y * y + z * z); float len = sqrtf(x * x + y * y + z * z);
if (len > 0.0f) { if(len > 0.0f) {
if (x == 0.0f && y == 0.0f) *r_u = 0.0f; /* othwise domain error */ if(x == 0.0f && y == 0.0f)
else *r_u = (1.0f - atan2f(x, y) / (float)M_PI) / 2.0f; *r_u = 0.0f; /* othwise domain error */
*r_v = 1.0f - safe_acosf(z / len) / (float)M_PI; else
*r_u = (1.0f - atan2f(x, y) / M_PI_F) / 2.0f;
*r_v = 1.0f - safe_acosf(z / len) / M_PI_F;
return true; return true;
} }
else { else {