diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2016-04-29 00:46:00 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2016-04-29 00:57:20 +0300 |
| commit | 636195e402e9272903c8d08f1999f7acf2f762fe (patch) | |
| tree | a8449f7a0834274caea5783fed01939b552f012a /intern/cycles/kernel/kernel_jitter.h | |
| parent | a48d7407986d04492107a2ef16d0ff6f0d012c45 (diff) | |
Fix T48301: Cycles incorrect render with CMJ and viewport samples 0.
Max samples 2147483647 was causing integer overflow.
Diffstat (limited to 'intern/cycles/kernel/kernel_jitter.h')
| -rw-r--r-- | intern/cycles/kernel/kernel_jitter.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/kernel/kernel_jitter.h b/intern/cycles/kernel/kernel_jitter.h index a98881b5af3..aec7bc33acd 100644 --- a/intern/cycles/kernel/kernel_jitter.h +++ b/intern/cycles/kernel/kernel_jitter.h @@ -175,7 +175,7 @@ ccl_device void cmj_sample_2D(int s, int N, int p, float *fx, float *fy) #else int m = float_to_int(sqrtf(N)); #endif - int n = (N + m - 1)/m; + int n = (N - 1)/m + 1; float invN = 1.0f/N; float invm = 1.0f/m; float invn = 1.0f/n; |