[Bf-blender-cvs] [03ce988] master: Fix T41839, OpenCL error.

[Thomas Dinges]

Commit: 03ce9882afa34873a8e3ea0e56d2a9ddc294e607
Author: Thomas Dinges
Date:   Mon Sep 15 14:22:39 2014 +0200
Branches: master
https://developer.blender.org/rB03ce9882afa34873a8e3ea0e56d2a9ddc294e607

Fix T41839, OpenCL error.

Also some style fixes, we don't do the "put as much as possible in 1 line" contest.

===================================================================

M	intern/cycles/util/util_math.h

===================================================================

diff --git a/intern/cycles/util/util_math.h b/intern/cycles/util/util_math.h
index 1cd8883..1e8d8f3 100644
--- a/intern/cycles/util/util_math.h
+++ b/intern/cycles/util/util_math.h
@@ -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)
 {
 	float len = sqrtf(x * x + y * y + z * z);
-	if (len > 0.0f) {
-		if (x == 0.0f && y == 0.0f) *r_u = 0.0f;  /* othwise domain error */
-		else *r_u = (1.0f - atan2f(x, y) / (float)M_PI) / 2.0f;
-		*r_v = 1.0f - safe_acosf(z / len) / (float)M_PI;
+	if(len > 0.0f) {
+		if(x == 0.0f && y == 0.0f)
+			*r_u = 0.0f;  /* othwise domain error */
+		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;
 	}
 	else {