diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-02-01 22:54:24 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-02-01 22:54:24 +0400 |
| commit | 736d7810a0ba6dc4fa1439b8c45d4b6782a9aa31 (patch) | |
| tree | b5f9596083811807e0f98ccc51d397e1ec946e7a /intern/cycles/kernel/kernel_light.h | |
| parent | 4838a2c75a77ede4e2a23b711012088beaa2626c (diff) | |
Fix an issue with the new cycles lamp MIS option not working correct with
multiple lamps.
Diffstat (limited to 'intern/cycles/kernel/kernel_light.h')
| -rw-r--r-- | intern/cycles/kernel/kernel_light.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/intern/cycles/kernel/kernel_light.h b/intern/cycles/kernel/kernel_light.h index 8b32b7bd2e8..10a32226f17 100644 --- a/intern/cycles/kernel/kernel_light.h +++ b/intern/cycles/kernel/kernel_light.h @@ -312,6 +312,9 @@ __device bool lamp_light_eval(KernelGlobals *kg, int lamp, float3 P, float3 D, f ls->prim = ~0; ls->lamp = lamp; + if(!(ls->shader & SHADER_USE_MIS)) + return false; + if(type == LIGHT_DISTANT) { /* distant light */ float radius = data1.y; |