diff options
author | Campbell Barton <ideasman42@gmail.com> | 2016-02-17 13:36:54 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2016-02-17 13:39:23 +0300 |
commit | 88d4d0d0709d1aa9a10ca8305b4eab05c7117dd1 (patch) | |
tree | f21a67d7612b175055dd1393b28c335e76bacb73 /intern/cycles/kernel/shaders | |
parent | d6b77450ce185339de5f16f3bdf4596e0ce57230 (diff) |
Cleanup: OSL style
Diffstat (limited to 'intern/cycles/kernel/shaders')
5 files changed, 6 insertions, 6 deletions
diff --git a/intern/cycles/kernel/shaders/node_magic_texture.osl b/intern/cycles/kernel/shaders/node_magic_texture.osl index 97f1fcd76b5..55992e3494c 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 0427c001f6d..fc93dbd044b 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 f7f7734f4e5..4d4c28b57a2 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 e45af62220f..9253febd64a 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 beb2a9de112..59f61d3b46a 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; } } |