diff options
| author | Thomas Dinges <blender@dingto.org> | 2012-06-08 23:57:25 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2012-06-08 23:57:25 +0400 |
| commit | 7c87f646c256dc8b8a97de2ad2d5c4b0dbe1a4a0 (patch) | |
| tree | f1dbdd98367d5765aa3e4c5411c22d385dbba163 /intern/cycles/kernel/svm/svm_texture.h | |
| parent | 3d740121ed6f0264ae85eeafe6c0a5addf68ac8c (diff) | |
Cycles / Textures:
* Some code cleanup, removed old enums, which are not used anymore.
* Some renaming for consistency and to match new texture names.
Diffstat (limited to 'intern/cycles/kernel/svm/svm_texture.h')
| -rw-r--r-- | intern/cycles/kernel/svm/svm_texture.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/kernel/svm/svm_texture.h b/intern/cycles/kernel/svm/svm_texture.h index 448132bff46..da74654f25e 100644 --- a/intern/cycles/kernel/svm/svm_texture.h +++ b/intern/cycles/kernel/svm/svm_texture.h @@ -188,7 +188,7 @@ __device float noise_basis_hard(float3 p, NodeNoiseBasis basis, int hard) /* Waves */ -__device float noise_wave(NodeWaveType wave, float a) +__device float noise_wave(NodeWaveBasis wave, float a) { if(wave == NODE_WAVE_SINE) { return 0.5f + 0.5f*sin(a); |