Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Dinges <blender@dingto.org>2013-06-04 21:20:00 +0400
committerThomas Dinges <blender@dingto.org>2013-06-04 21:20:00 +0400
commit9e4914e0553d0b7f57a3db86741307a17d79c21c (patch)
treeac5c2500d9f171deba253bd99c090726f3208576 /intern/cycles/kernel/svm/svm_wave.h
parent4a7f37f6ed3569b12ff195081cca3f31430bef67 (diff)
Cycles:
* Revert r57203 (len() renaming) There seems to be a problem with nVidia OpenCL after this and I haven't figured out the real cause yet. Better to selectively enable native length() later, after figuring out what's wrong. This fixes [#35612].
Diffstat (limited to 'intern/cycles/kernel/svm/svm_wave.h')
-rw-r--r--intern/cycles/kernel/svm/svm_wave.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/kernel/svm/svm_wave.h b/intern/cycles/kernel/svm/svm_wave.h
index e37b0788361..d2d808e4063 100644
--- a/intern/cycles/kernel/svm/svm_wave.h
+++ b/intern/cycles/kernel/svm/svm_wave.h
@@ -29,7 +29,7 @@ __device_noinline float svm_wave(NodeWaveType type, float3 p, float scale, float
if(type == NODE_WAVE_BANDS)
n = (p.x + p.y + p.z) * 10.0f;
else /* if(type == NODE_WAVE_RINGS) */
- n = length(p) * 20.0f;
+ n = len(p) * 20.0f;
if(distortion != 0.0f)
n += distortion * noise_turbulence(p*dscale, NODE_NOISE_PERLIN, detail, 0);