diff options
| author | Thomas Dinges <blender@dingto.org> | 2013-09-08 21:20:47 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2013-09-08 21:20:47 +0400 |
| commit | 3b9edee71115b421d2b7aeb7b9cc62200f151f8f (patch) | |
| tree | 99b221dba7ab394ad6439e1ea7f82f239661d29d /intern/cycles/kernel/kernel_path.h | |
| parent | 470dc6de4b0e0415671853ec8bf08b3b68338eb6 (diff) | |
Cycles:
* Fix some compile errors, when building without Branched Path.
Diffstat (limited to 'intern/cycles/kernel/kernel_path.h')
| -rw-r--r-- | intern/cycles/kernel/kernel_path.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/intern/cycles/kernel/kernel_path.h b/intern/cycles/kernel/kernel_path.h index 1f0d9973bed..4b1955e8523 100644 --- a/intern/cycles/kernel/kernel_path.h +++ b/intern/cycles/kernel/kernel_path.h @@ -232,7 +232,7 @@ __device_inline bool shadow_blocked(KernelGlobals *kg, PathState *state, Ray *ra } -#if defined(__BRANCHED_PATH__) || defined(__BSSRDF__) +#if defined(__BRANCHED_PATH__) || defined(__SUBSURFACE__) __device void kernel_path_indirect(KernelGlobals *kg, RNG *rng, int sample, Ray ray, __global float *buffer, float3 throughput, int num_samples, int num_total_samples, @@ -290,7 +290,9 @@ __device void kernel_path_indirect(KernelGlobals *kg, RNG *rng, int sample, Ray shader_setup_from_ray(kg, &sd, &isect, &ray, state.bounce); float rbsdf = path_rng_1D(kg, rng, sample, num_total_samples, rng_offset + PRNG_BSDF); shader_eval_surface(kg, &sd, rbsdf, state.flag, SHADER_CONTEXT_INDIRECT); +#ifdef __BRANCHED_PATH__ shader_merge_closures(kg, &sd); +#endif /* blurring of bsdf after bounces, for rays that have a small likelihood * of following this particular path (diffuse, rough glossy) */ |