diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-06-09 22:56:12 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-06-09 22:56:12 +0400 |
| commit | 2c1abe1f5861330315a1fc58e7dfe298b8356449 (patch) | |
| tree | a352dc0dbb973a014522f7f2033bf54a7953c85e /intern/cycles/kernel/svm/svm_noise.h | |
| parent | c6cffe98fa5eb6108956d484596153d214687e67 (diff) | |
style cleanup: assignment & indentation.
Diffstat (limited to 'intern/cycles/kernel/svm/svm_noise.h')
| -rw-r--r-- | intern/cycles/kernel/svm/svm_noise.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/intern/cycles/kernel/svm/svm_noise.h b/intern/cycles/kernel/svm/svm_noise.h index 22f3187943c..dfaf43acbd4 100644 --- a/intern/cycles/kernel/svm/svm_noise.h +++ b/intern/cycles/kernel/svm/svm_noise.h @@ -84,9 +84,9 @@ __device uint phash(int kx, int ky, int kz, int3 p) __device float floorfrac(float x, int* i) { - float f = floorf(x); - *i = (int)f; - return x - f; + float f = floorf(x); + *i = (int)f; + return x - f; } __device float fade(float t) @@ -96,7 +96,7 @@ __device float fade(float t) __device float nerp(float t, float a, float b) { - return (1.0f - t) * a + t * b; + return (1.0f - t) * a + t * b; } __device float grad(int hash, float x, float y, float z) |