diff options
| author | Thomas Dinges <blender@dingto.org> | 2013-06-14 18:29:00 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2013-06-14 18:29:00 +0400 |
| commit | 88b30ccb8cc2552ec6ca118cdcab4f75d5fb19b5 (patch) | |
| tree | 54b965dcf2bc40d8d39549b2890f84b01433cf22 /intern/cycles/kernel/svm/svm_texture.h | |
| parent | cc3476b07eacae29ab34c2f2bdbca8af63b10e78 (diff) | |
Cycles:
* Style cleanup for M_PI constants.
* Move Wireframe node into __EXTRA_NODES__ define
Diffstat (limited to 'intern/cycles/kernel/svm/svm_texture.h')
| -rw-r--r-- | intern/cycles/kernel/svm/svm_texture.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/kernel/svm/svm_texture.h b/intern/cycles/kernel/svm/svm_texture.h index ba5b772b3a1..3347b623506 100644 --- a/intern/cycles/kernel/svm/svm_texture.h +++ b/intern/cycles/kernel/svm/svm_texture.h @@ -185,7 +185,7 @@ __device float noise_wave(NodeWaveBasis wave, float a) return 0.5f + 0.5f * sinf(a); } else if(wave == NODE_WAVE_SAW) { - float b = 2.0f*M_PI_F; + float b = M_2PI_F; int n = float_to_int(a / b); a -= n*b; if(a < 0.0f) a += b; @@ -193,7 +193,7 @@ __device float noise_wave(NodeWaveBasis wave, float a) return a / b; } else if(wave == NODE_WAVE_TRI) { - float b = 2.0f*M_PI_F; + float b = M_2PI_F; float rmax = 1.0f; return rmax - 2.0f*fabsf(floorf((a*(1.0f/b))+0.5f) - (a*(1.0f/b))); |