diff options
| author | Shane Ambler <Shane@ShaneWare.Biz> | 2018-12-03 14:16:30 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-12-03 17:14:21 +0300 |
| commit | 5a6f1fa563759a065d4a21b9b6178d61ebe993a2 (patch) | |
| tree | f789aa672dd981c0820f7408612f2b650a2486b6 /intern/cycles/kernel/shaders/node_noise_texture.osl | |
| parent | 6bb825e0837e5e090c32567d335fe677e33e5ab0 (diff) | |
Fix T58600: update OSL scripts to work with OSL 1.10.x.
Diffstat (limited to 'intern/cycles/kernel/shaders/node_noise_texture.osl')
| -rw-r--r-- | intern/cycles/kernel/shaders/node_noise_texture.osl | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/intern/cycles/kernel/shaders/node_noise_texture.osl b/intern/cycles/kernel/shaders/node_noise_texture.osl index e83e5b5b211..42a30897341 100644 --- a/intern/cycles/kernel/shaders/node_noise_texture.osl +++ b/intern/cycles/kernel/shaders/node_noise_texture.osl @@ -19,9 +19,10 @@ /* Noise */ -float noise(point p, float distortion, float detail, float fac, color Color) +float noise(point ip, float distortion, float detail, output color Color) { point r; + point p = ip; int hard = 0; if (distortion != 0.0) { @@ -32,7 +33,7 @@ float noise(point p, float distortion, float detail, float fac, color Color) p += r; } - fac = noise_turbulence(p, detail, hard); + float fac = noise_turbulence(p, detail, hard); Color = color(fac, noise_turbulence(point(p[1], p[0], p[2]), detail, hard), noise_turbulence(point(p[1], p[2], p[0]), detail, hard)); @@ -55,6 +56,6 @@ shader node_noise_texture( if (use_mapping) p = transform(mapping, p); - Fac = noise(p * Scale, Distortion, Detail, Fac, Color); + Fac = noise(p * Scale, Distortion, Detail, Color); } |