diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-05-03 22:29:11 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-05-03 22:29:11 +0400 |
| commit | 2996f08f845c4b67b0231d5832668da5ddb2d227 (patch) | |
| tree | 419f3dbd78a19398883a405606f7a7de83084d90 /intern/cycles/kernel/svm/svm_noise.h | |
| parent | 170f8c8c4109afb366bac0f385d9e2f59af6c8e2 (diff) | |
Cycles: first batch of windows build fixes, not quite there yet.
Diffstat (limited to 'intern/cycles/kernel/svm/svm_noise.h')
| -rw-r--r-- | intern/cycles/kernel/svm/svm_noise.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/intern/cycles/kernel/svm/svm_noise.h b/intern/cycles/kernel/svm/svm_noise.h index 745744e142c..f41caa99772 100644 --- a/intern/cycles/kernel/svm/svm_noise.h +++ b/intern/cycles/kernel/svm/svm_noise.h @@ -143,9 +143,9 @@ __device float perlin_periodic(float x, float y, float z, float3 pperiod) int3 p; - p.x = fmaxf(quick_floor(pperiod.x), 1); - p.y = fmaxf(quick_floor(pperiod.y), 1); - p.z = fmaxf(quick_floor(pperiod.z), 1); + p.x = max(quick_floor(pperiod.x), 1); + p.y = max(quick_floor(pperiod.y), 1); + p.z = max(quick_floor(pperiod.z), 1); float u = fade(fx); float v = fade(fy); |