From 965e0aeb593c07804e3a5e4e143eeab428e7f83c Mon Sep 17 00:00:00 2001 From: Thomas Dinges Date: Tue, 23 Jul 2013 16:23:30 +0000 Subject: Cycles / CMJ: * path_rng_2D() was missing an else branch for the sobol case after fix in r57383. --- intern/cycles/kernel/kernel_random.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'intern/cycles/kernel/kernel_random.h') 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) -- cgit v1.2.3