[Bf-blender-cvs] [88d4d0d] master: Cleanup: OSL style

Campbell Barton noreply at git.blender.org
Wed Feb 17 11:47:06 CET 2016


Commit: 88d4d0d0709d1aa9a10ca8305b4eab05c7117dd1
Author: Campbell Barton
Date:   Wed Feb 17 21:36:54 2016 +1100
Branches: master
https://developer.blender.org/rB88d4d0d0709d1aa9a10ca8305b4eab05c7117dd1

Cleanup: OSL style

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

M	intern/cycles/kernel/shaders/node_magic_texture.osl
M	intern/cycles/kernel/shaders/node_rgb_curves.osl
M	intern/cycles/kernel/shaders/node_vector_curves.osl
M	intern/cycles/kernel/shaders/node_voxel_texture.osl
M	intern/cycles/kernel/shaders/node_wave_texture.osl

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

diff --git a/intern/cycles/kernel/shaders/node_magic_texture.osl b/intern/cycles/kernel/shaders/node_magic_texture.osl
index 97f1fcd..55992e3 100644
--- a/intern/cycles/kernel/shaders/node_magic_texture.osl
+++ b/intern/cycles/kernel/shaders/node_magic_texture.osl
@@ -106,6 +106,6 @@ shader node_magic_texture(
 		p = transform(mapping, p);
 
 	Color = magic(p * Scale, Depth, Distortion);
-	Fac = (Color[0] + Color[1] + Color[2]) * (1.0/3.0);
+	Fac = (Color[0] + Color[1] + Color[2]) * (1.0 / 3.0);
 }
 
diff --git a/intern/cycles/kernel/shaders/node_rgb_curves.osl b/intern/cycles/kernel/shaders/node_rgb_curves.osl
index 0427c00..fc93dbd 100644
--- a/intern/cycles/kernel/shaders/node_rgb_curves.osl
+++ b/intern/cycles/kernel/shaders/node_rgb_curves.osl
@@ -21,7 +21,7 @@ float ramp_lookup(color ramp[RAMP_TABLE_SIZE], float at, int component)
 {
 	if (at < 0.0 || at > 1.0) {
 		float t0, dy;
-		if(at < 0.0) {
+		if (at < 0.0) {
 			t0 = ramp[0][component];
 			dy = t0 - ramp[1][component];
 			at = -at;
diff --git a/intern/cycles/kernel/shaders/node_vector_curves.osl b/intern/cycles/kernel/shaders/node_vector_curves.osl
index f7f7734..4d4c28b 100644
--- a/intern/cycles/kernel/shaders/node_vector_curves.osl
+++ b/intern/cycles/kernel/shaders/node_vector_curves.osl
@@ -21,7 +21,7 @@ float ramp_lookup(color ramp[RAMP_TABLE_SIZE], float at, int component)
 {
 	if (at < 0.0 || at > 1.0) {
 		float t0, dy;
-		if(at < 0.0) {
+		if (at < 0.0) {
 			t0 = ramp[0][component];
 			dy = t0 - ramp[1][component];
 			at = -at;
diff --git a/intern/cycles/kernel/shaders/node_voxel_texture.osl b/intern/cycles/kernel/shaders/node_voxel_texture.osl
index e45af62..9253feb 100644
--- a/intern/cycles/kernel/shaders/node_voxel_texture.osl
+++ b/intern/cycles/kernel/shaders/node_voxel_texture.osl
@@ -35,8 +35,8 @@ shader node_voxel_texture(
 		if (getattribute("geom:generated_transform", tfm))
 			p = transform(tfm, p);
 	}
-	if(p[0] < 0.0 || p[1] < 0.0 || p[2] < 0.0 ||
-	   p[0] > 1.0 || p[1] > 1.0 || p[2] > 1.0)
+	if (p[0] < 0.0 || p[1] < 0.0 || p[2] < 0.0 ||
+	    p[0] > 1.0 || p[1] > 1.0 || p[2] > 1.0)
 	{
 		Density = 0;
 		Color = color(0, 0, 0);
diff --git a/intern/cycles/kernel/shaders/node_wave_texture.osl b/intern/cycles/kernel/shaders/node_wave_texture.osl
index beb2a9d..59f61d3 100644
--- a/intern/cycles/kernel/shaders/node_wave_texture.osl
+++ b/intern/cycles/kernel/shaders/node_wave_texture.osl
@@ -41,7 +41,7 @@ float wave(point p, string type, string profile, float detail, float distortion,
 		/* Saw profile */
 		n /= M_2PI;
 		n -= (int) n;
-		return (n < 0.0)? n + 1.0: n;
+		return (n < 0.0) ? n + 1.0 : n;
 	}
 }




More information about the Bf-blender-cvs mailing list