style cleanup: assignment & indentation.

8 files changed, 42 insertions, 42 deletions

diff --git a/intern/cycles/kernel/svm/bsdf.h b/intern/cycles/kernel/svm/bsdf.h
index ba78a93f54f..1a90eab0cd1 100644
--- a/intern/cycles/kernel/svm/bsdf.h
+++ b/intern/cycles/kernel/svm/bsdf.h
@@ -47,7 +47,7 @@ __device float fresnel_dielectric(float eta, const float3 N,
 	float cos = dot(N, I), neta;
 	float3 Nn;
 	// compute reflection
-	*R =(2 * cos)* N - I;
+	*R = (2 * cos)* N - I;
 #ifdef __RAY_DIFFERENTIALS__
 	*dRdx = (2 * dot(N, dIdx)) * N - dIdx;
 	*dRdy = (2 * dot(N, dIdy)) * N - dIdy;
@@ -65,18 +65,18 @@ __device float fresnel_dielectric(float eta, const float3 N,
 		Nn   = -N;
 		*is_inside = true;
 	}
-	*R =(2 * cos)* Nn - I;
+	*R = (2 * cos)* Nn - I;
 	float arg = 1 -(neta * neta *(1 -(cos * cos)));
 	if(arg < 0) {
-		*T= make_float3(0.0f, 0.0f, 0.0f);
+		*T = make_float3(0.0f, 0.0f, 0.0f);
 #ifdef __RAY_DIFFERENTIALS__
-		*dTdx= make_float3(0.0f, 0.0f, 0.0f);
-		*dTdy= make_float3(0.0f, 0.0f, 0.0f);
+		*dTdx = make_float3(0.0f, 0.0f, 0.0f);
+		*dTdy = make_float3(0.0f, 0.0f, 0.0f);
 #endif
 		return 1; // total internal reflection
 	} else {
 		float dnp = sqrtf(arg);
-		float nK =(neta * cos)- dnp;
+		float nK = (neta * cos)- dnp;
 		*T = -(neta * I)+(nK * Nn);
 #ifdef __RAY_DIFFERENTIALS__
 		*dTdx = -(neta * dIdx) + ((neta - neta * neta * cos / dnp) * dot(dIdx, Nn)) * Nn;
@@ -85,8 +85,8 @@ __device float fresnel_dielectric(float eta, const float3 N,
 		// compute Fresnel terms
 		float cosTheta1 = cos; // N.R
 		float cosTheta2 = -dot(Nn, *T);
-		float pPara =(cosTheta1 - eta * cosTheta2)/(cosTheta1 + eta * cosTheta2);
-		float pPerp =(eta * cosTheta1 - cosTheta2)/(eta * cosTheta1 + cosTheta2);
+		float pPara = (cosTheta1 - eta * cosTheta2)/(cosTheta1 + eta * cosTheta2);
+		float pPerp = (eta * cosTheta1 - cosTheta2)/(eta * cosTheta1 + cosTheta2);
 		return 0.5f * (pPara * pPara + pPerp * pPerp);
 	}
 }
@@ -99,8 +99,8 @@ __device float fresnel_dielectric_cos(float cosi, float eta)
 	float g = eta * eta - 1 + c * c;
 	if(g > 0) {
 		g = sqrtf(g);
-		float A =(g - c)/(g + c);
-		float B =(c *(g + c)- 1)/(c *(g - c)+ 1);
+		float A = (g - c)/(g + c);
+		float B = (c *(g + c)- 1)/(c *(g - c)+ 1);
 		return 0.5f * A * A *(1 + B * B);
 	}
 	return 1.0f; // TIR(no refracted component)
@@ -110,10 +110,10 @@ __device float fresnel_conductor(float cosi, float eta, float k)
 {
 	float tmp_f = eta * eta + k * k;
 	float tmp = tmp_f * cosi * cosi;
-	float Rparl2 =(tmp -(2.0f * eta * cosi)+ 1)/
-				 (tmp +(2.0f * eta * cosi)+ 1);
-	float Rperp2 =(tmp_f -(2.0f * eta * cosi)+ cosi * cosi)/
-				 (tmp_f +(2.0f * eta * cosi)+ cosi * cosi);
+	float Rparl2 = (tmp - (2.0f * eta * cosi) + 1)/
+	               (tmp + (2.0f * eta * cosi) + 1);
+	float Rperp2 = (tmp_f - (2.0f * eta * cosi) + cosi * cosi)/
+	               (tmp_f + (2.0f * eta * cosi) + cosi * cosi);
 	return(Rparl2 + Rperp2) * 0.5f;
 }
 
diff --git a/intern/cycles/kernel/svm/svm_gradient.h b/intern/cycles/kernel/svm/svm_gradient.h
index b29abed4edc..7fad1175c49 100644
--- a/intern/cycles/kernel/svm/svm_gradient.h
+++ b/intern/cycles/kernel/svm/svm_gradient.h
@@ -24,9 +24,9 @@ __device float svm_gradient(float3 p, NodeGradientType type)
 {
 	float x, y, z;
 
-	x= p.x;
-	y= p.y;
-	z= p.z;
+	x = p.x;
+	y = p.y;
+	z = p.z;
 
 	if(type == NODE_BLEND_LINEAR) {
 		return x;
diff --git a/intern/cycles/kernel/svm/svm_magic.h b/intern/cycles/kernel/svm/svm_magic.h
index 65d37937e1e..fdded813784 100644
--- a/intern/cycles/kernel/svm/svm_magic.h
+++ b/intern/cycles/kernel/svm/svm_magic.h
@@ -34,39 +34,39 @@ __device_noinline float3 svm_magic(float3 p, int n, float distortion)
 		y *= distortion;
 
 		if(n > 1) {
-			x= cosf(x-y-z);
+			x = cosf(x-y-z);
 			x *= distortion;
 
 			if(n > 2) {
-				z= sinf(-x-y-z);
+				z = sinf(-x-y-z);
 				z *= distortion;
 
 				if(n > 3) {
-					x= -cosf(-x+y-z);
+					x = -cosf(-x+y-z);
 					x *= distortion;
 
 					if(n > 4) {
-						y= -sinf(-x+y+z);
+						y = -sinf(-x+y+z);
 						y *= distortion;
 
 						if(n > 5) {
-							y= -cosf(-x+y+z);
+							y = -cosf(-x+y+z);
 							y *= distortion;
 
 							if(n > 6) {
-								x= cosf(x+y+z);
+								x = cosf(x+y+z);
 								x *= distortion;
 
 								if(n > 7) {
-									z= sinf(x+y-z);
+									z = sinf(x+y-z);
 									z *= distortion;
 
 									if(n > 8) {
-										x= -cosf(-x-y+z);
+										x = -cosf(-x-y+z);
 										x *= distortion;
 
 										if(n > 9) {
-											y= -sinf(x-y+z);
+											y = -sinf(x-y+z);
 											y *= distortion;
 										}
 									}
diff --git a/intern/cycles/kernel/svm/svm_mix.h b/intern/cycles/kernel/svm/svm_mix.h
index e2274a2e691..6b455e713c2 100644
--- a/intern/cycles/kernel/svm/svm_mix.h
+++ b/intern/cycles/kernel/svm/svm_mix.h
@@ -248,8 +248,8 @@ __device float3 svm_mix_soft(float t, float3 col1, float3 col2)
 {
 	float tm = 1.0f - t;
 
-	float3 one= make_float3(1.0f, 1.0f, 1.0f);
-	float3 scr= one - (one - col2)*(one - col1);
+	float3 one = make_float3(1.0f, 1.0f, 1.0f);
+	float3 scr = one - (one - col2)*(one - col1);
 
 	return tm*col1 + t*((one - col1)*col2*col1 + col1*scr);
 }
@@ -259,19 +259,19 @@ __device float3 svm_mix_linear(float t, float3 col1, float3 col2)
 	float3 outcol = col1;
 
 	if(col2.x > 0.5f)
-		outcol.x= col1.x + t*(2.0f*(col2.x - 0.5f));
+		outcol.x = col1.x + t*(2.0f*(col2.x - 0.5f));
 	else
-		outcol.x= col1.x + t*(2.0f*(col2.x) - 1.0f);
+		outcol.x = col1.x + t*(2.0f*(col2.x) - 1.0f);
 
 	if(col2.y > 0.5f)
-		outcol.y= col1.y + t*(2.0f*(col2.y - 0.5f));
+		outcol.y = col1.y + t*(2.0f*(col2.y - 0.5f));
 	else
-		outcol.y= col1.y + t*(2.0f*(col2.y) - 1.0f);
+		outcol.y = col1.y + t*(2.0f*(col2.y) - 1.0f);
 
 	if(col2.z > 0.5f)
-		outcol.z= col1.z + t*(2.0f*(col2.z - 0.5f));
+		outcol.z = col1.z + t*(2.0f*(col2.z - 0.5f));
 	else
-		outcol.z= col1.z + t*(2.0f*(col2.z) - 1.0f);
+		outcol.z = col1.z + t*(2.0f*(col2.z) - 1.0f);
 	
 	return outcol;
 }
diff --git a/intern/cycles/kernel/svm/svm_noise.h b/intern/cycles/kernel/svm/svm_noise.h
index 22f3187943c..dfaf43acbd4 100644
--- a/intern/cycles/kernel/svm/svm_noise.h
+++ b/intern/cycles/kernel/svm/svm_noise.h
@@ -84,9 +84,9 @@ __device uint phash(int kx, int ky, int kz, int3 p)
 
 __device float floorfrac(float x, int* i)
 {
-    float f = floorf(x);
-    *i = (int)f;
-    return x - f;
+	float f = floorf(x);
+	*i = (int)f;
+	return x - f;
 }
 
 __device float fade(float t)
@@ -96,7 +96,7 @@ __device float fade(float t)
 
 __device float nerp(float t, float a, float b)
 {
-    return (1.0f - t) * a + t * b;
+	return (1.0f - t) * a + t * b;
 }
 
 __device float grad(int hash, float x, float y, float z)
diff --git a/intern/cycles/kernel/svm/svm_texture.h b/intern/cycles/kernel/svm/svm_texture.h
index d12a85a5402..6c22d98e0df 100644
--- a/intern/cycles/kernel/svm/svm_texture.h
+++ b/intern/cycles/kernel/svm/svm_texture.h
@@ -221,7 +221,7 @@ __device_noinline float noise_turbulence(float3 p, NodeNoiseBasis basis, float o
 	int i, n;
 
 	octaves = clamp(octaves, 0.0f, 16.0f);
-	n= (int)octaves;
+	n = (int)octaves;
 
 	for(i = 0; i <= n; i++) {
 		float t = noise_basis(fscale*p, basis);
diff --git a/intern/cycles/kernel/svm/svm_voronoi.h b/intern/cycles/kernel/svm/svm_voronoi.h
index f5ee7851a51..7e7bd970320 100644
--- a/intern/cycles/kernel/svm/svm_voronoi.h
+++ b/intern/cycles/kernel/svm/svm_voronoi.h
@@ -38,7 +38,7 @@ __device_noinline float4 svm_voronoi(NodeVoronoiColoring coloring, float scale,
 	}
 	else {
 		color = cellnoise_color(pa[0]);
-        fac= average(color);
+		fac = average(color);
 	}
 
 	return make_float4(color.x, color.y, color.z, fac);
diff --git a/intern/cycles/kernel/svm/svm_wave.h b/intern/cycles/kernel/svm/svm_wave.h
index 7050bbe7f00..d2d808e4063 100644
--- a/intern/cycles/kernel/svm/svm_wave.h
+++ b/intern/cycles/kernel/svm/svm_wave.h
@@ -27,9 +27,9 @@ __device_noinline float svm_wave(NodeWaveType type, float3 p, float scale, float
 	p *= scale;
 
 	if(type == NODE_WAVE_BANDS)
-		n= (p.x + p.y + p.z)*10.0f;
+		n = (p.x + p.y + p.z) * 10.0f;
 	else /* if(type == NODE_WAVE_RINGS) */
-		n= len(p)*20.0f;
+		n = len(p) * 20.0f;
 	
 	if(distortion != 0.0f)
 		n += distortion * noise_turbulence(p*dscale, NODE_NOISE_PERLIN, detail, 0);