diff options
| author | Julian Eisel <julian@blender.org> | 2020-07-01 18:25:04 +0300 |
|---|---|---|
| committer | Julian Eisel <julian@blender.org> | 2020-07-01 18:25:04 +0300 |
| commit | 889c4ca9c26d770af02cedef972d65eb173bdb5e (patch) | |
| tree | 6f46156146db1b3f09d92c6eaa1f44ba8a584ed4 /intern/cycles/kernel/kernel_emission.h | |
| parent | 87df15190210eb84ef52e5dccc2932918f912da5 (diff) | |
| parent | 0829cebeb024095c268f190c34daa8ae9a5a224c (diff) | |
Merge branch 'asset-uuid--archived' into asset-engine--archivedasset-engine--archived
Diffstat (limited to 'intern/cycles/kernel/kernel_emission.h')
| -rw-r--r-- | intern/cycles/kernel/kernel_emission.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/intern/cycles/kernel/kernel_emission.h b/intern/cycles/kernel/kernel_emission.h index 71b176a0a8f..4ac07d86dda 100644 --- a/intern/cycles/kernel/kernel_emission.h +++ b/intern/cycles/kernel/kernel_emission.h @@ -326,9 +326,7 @@ ccl_device_noinline_cpu float3 indirect_background(KernelGlobals *kg, /* Background MIS weights. */ # ifdef __BACKGROUND_MIS__ /* Check if background light exists or if we should skip pdf. */ - int res_x = kernel_data.integrator.pdf_background_res_x; - - if (!(state->flag & PATH_RAY_MIS_SKIP) && res_x) { + if (!(state->flag & PATH_RAY_MIS_SKIP) && kernel_data.background.use_mis) { /* multiple importance sampling, get background light pdf for ray * direction, and compute weight with respect to BSDF pdf */ float pdf = background_light_pdf(kg, ray->P, ray->D); |