diff options
| author | Thomas Dinges <blender@dingto.org> | 2013-03-10 04:42:47 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2013-03-10 04:42:47 +0400 |
| commit | 56538ea685672fd882bbac81b0b4223dfaa3f7ce (patch) | |
| tree | 31a2ebbbdb918b2d738c69775803cf5868e8b8ea /intern/cycles/kernel/shaders/node_wave_texture.osl | |
| parent | 5ac628fb477aaf2c2f0ee8ab5c25fb850a4c0a2a (diff) | |
Cycles / OSL:
* More small improvements: return immediately, and use "else if".
Diffstat (limited to 'intern/cycles/kernel/shaders/node_wave_texture.osl')
| -rw-r--r-- | intern/cycles/kernel/shaders/node_wave_texture.osl | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/intern/cycles/kernel/shaders/node_wave_texture.osl b/intern/cycles/kernel/shaders/node_wave_texture.osl index 11c4689196d..12b837bc448 100644 --- a/intern/cycles/kernel/shaders/node_wave_texture.osl +++ b/intern/cycles/kernel/shaders/node_wave_texture.osl @@ -27,7 +27,6 @@ float wave(point p, float scale, string type, float detail, float distortion, fl float y = p[1] * scale; float z = p[2] * scale; - float result = 0.0; float n = 0.0; if (type == "Bands") { @@ -40,9 +39,7 @@ float wave(point p, float scale, string type, float detail, float distortion, fl if (distortion != 0.0) { n = n + (distortion * noise_turbulence(p * dscale, "Perlin", detail, 0)); } - result = noise_wave("Sine", n); - - return result; + return noise_wave("Sine", n); } shader node_wave_texture( @@ -63,6 +60,6 @@ shader node_wave_texture( p = transform(mapping, p); Fac = wave(p, Scale, Type, Detail, Distortion, DetailScale); - Color = color(Fac, Fac, Fac); + Color = Fac; } |