diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-01-30 19:57:15 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-01-30 19:57:15 +0400 |
| commit | dc0f4b56183cd81b6ba4653d281f6b8ec236a574 (patch) | |
| tree | 96bb9e62d6e78e224d3de22a5ef18a7f72c67853 /intern/cycles/kernel/kernel_emission.h | |
| parent | 4c971d572785c63a4c715210308664941c5c8f26 (diff) | |
Cycles: make multiple importance sampling for lamps an option per lamp now,
disabled by default for backwards compatibility.
http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Integrator
Diffstat (limited to 'intern/cycles/kernel/kernel_emission.h')
| -rw-r--r-- | intern/cycles/kernel/kernel_emission.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/kernel/kernel_emission.h b/intern/cycles/kernel/kernel_emission.h index 54bc0717b60..e234d54e228 100644 --- a/intern/cycles/kernel/kernel_emission.h +++ b/intern/cycles/kernel/kernel_emission.h @@ -93,7 +93,7 @@ __device bool direct_emission(KernelGlobals *kg, ShaderData *sd, int lindex, } /* return lamp index for MIS */ - if(ls.use_mis) + if(ls.shader & SHADER_USE_MIS) *lamp = ls.lamp; else *lamp= ~0; @@ -114,7 +114,7 @@ __device bool direct_emission(KernelGlobals *kg, ShaderData *sd, int lindex, shader_bsdf_eval(kg, sd, ls.D, eval, &bsdf_pdf); - if(ls.use_mis) { + if(ls.shader & SHADER_USE_MIS) { /* multiple importance sampling */ float mis_weight = power_heuristic(ls.pdf, bsdf_pdf); light_eval *= mis_weight; |