[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57650] trunk/blender/intern/cycles/kernel /shaders: style cleanup

[Campbell Barton]

Revision: 57650
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57650
Author:   campbellbarton
Date:     2013-06-22 10:59:30 +0000 (Sat, 22 Jun 2013)
Log Message:
-----------
style cleanup

Modified Paths:
--------------
    trunk/blender/intern/cycles/kernel/shaders/node_bump.osl
    trunk/blender/intern/cycles/kernel/shaders/node_color.h
    trunk/blender/intern/cycles/kernel/shaders/node_texture.h

Modified: trunk/blender/intern/cycles/kernel/shaders/node_bump.osl
===================================================================
--- trunk/blender/intern/cycles/kernel/shaders/node_bump.osl	2013-06-22 10:49:52 UTC (rev 57649)
+++ trunk/blender/intern/cycles/kernel/shaders/node_bump.osl	2013-06-22 10:59:30 UTC (rev 57650)
@@ -52,6 +52,6 @@
 	
 	/* compute and output perturbed normal */
 	NormalOut = normalize(absdet * NormalIn - dist * sign(det) * surfgrad);
-	NormalOut = normalize(strength*NormalOut + (1.0 - strength)*NormalIn);
+	NormalOut = normalize(strength * NormalOut + (1.0 - strength) * NormalIn);
 }
 

Modified: trunk/blender/intern/cycles/kernel/shaders/node_color.h
===================================================================
--- trunk/blender/intern/cycles/kernel/shaders/node_color.h	2013-06-22 10:49:52 UTC (rev 57649)
+++ trunk/blender/intern/cycles/kernel/shaders/node_color.h	2013-06-22 10:59:30 UTC (rev 57650)
@@ -50,8 +50,8 @@
 
 color color_unpremultiply(color c, float alpha)
 {
-	if(alpha != 1.0 && alpha != 0.0)
-		return c/alpha;
+	if (alpha != 1.0 && alpha != 0.0)
+		return c / alpha;
 
 	return c;
 }

Modified: trunk/blender/intern/cycles/kernel/shaders/node_texture.h
===================================================================
--- trunk/blender/intern/cycles/kernel/shaders/node_texture.h	2013-06-22 10:49:52 UTC (rev 57649)
+++ trunk/blender/intern/cycles/kernel/shaders/node_texture.h	2013-06-22 10:59:30 UTC (rev 57650)
@@ -162,7 +162,7 @@
 		f = noise(p);
 
 	/* can happen for big coordinates, things even out to 0.5 then anyway */
-	if(!isfinite(f))
+	if (!isfinite(f))
 		return 0.5;
 	
 	return f;
@@ -254,12 +254,12 @@
 		if (hard)
 			t = fabs(2.0 * t - 1.0);
 
-		float sum2 = sum + t*amp;
+		float sum2 = sum + t * amp;
 
 		sum *= ((float)(1 << n) / (float)((1 << (n + 1)) - 1));
 		sum2 *= ((float)(1 << (n + 1)) / (float)((1 << (n + 2)) - 1));
 
-		return (1.0 - rmd)*sum + rmd*sum2;
+		return (1.0 - rmd) * sum + rmd * sum2;
 	}
 	else {
 		sum *= ((float)(1 << n) / (float)((1 << (n + 1)) - 1));