diff options
| author | Thomas Dinges <blender@dingto.org> | 2013-07-23 20:23:30 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2013-07-23 20:23:30 +0400 |
| commit | 965e0aeb593c07804e3a5e4e143eeab428e7f83c (patch) | |
| tree | 7c23b2e9ef50eb058ac36a6c6f0ef83139c252d5 /intern/cycles/kernel/kernel_random.h | |
| parent | a3ccc4eaebdcab608a19fc905a7bdefadae61c07 (diff) | |
Cycles / CMJ:
* path_rng_2D() was missing an else branch for the sobol case after fix in r57383.
Diffstat (limited to 'intern/cycles/kernel/kernel_random.h')
| -rw-r--r-- | intern/cycles/kernel/kernel_random.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/intern/cycles/kernel/kernel_random.h b/intern/cycles/kernel/kernel_random.h index 6292adff6a5..c86ac34a057 100644 --- a/intern/cycles/kernel/kernel_random.h +++ b/intern/cycles/kernel/kernel_random.h @@ -141,11 +141,13 @@ __device_inline void path_rng_2D(KernelGlobals *kg, RNG *rng, int sample, int nu int p = *rng + dimension; cmj_sample_2D(sample, num_samples, p, fx, fy); } + else #endif - - /* sobol */ - *fx = path_rng_1D(kg, rng, sample, num_samples, dimension); - *fy = path_rng_1D(kg, rng, sample, num_samples, dimension + 1); + { + /* sobol */ + *fx = path_rng_1D(kg, rng, sample, num_samples, dimension); + *fy = path_rng_1D(kg, rng, sample, num_samples, dimension + 1); + } } __device_inline void path_rng_init(KernelGlobals *kg, __global uint *rng_state, int sample, int num_samples, RNG *rng, int x, int y, float *fx, float *fy) |