diff options
| author | Jeroen Bakker <j.bakker@atmind.nl> | 2019-03-05 16:26:28 +0300 |
|---|---|---|
| committer | Jeroen Bakker <j.bakker@atmind.nl> | 2019-03-05 16:26:28 +0300 |
| commit | 6d110a03b7b309a78202a7136da9c4853a5670c8 (patch) | |
| tree | f79bec8bd4e44f473d0c0a7f8b083ad07491834c /intern/cycles/kernel | |
| parent | 8b10e1b45798b39fd63adef65f2eae0c7fbadbac (diff) | |
| parent | a325bc6bf3e6dace5d1e15330650ea532052c9fc (diff) | |
Merge branch 'blender2.7'
Diffstat (limited to 'intern/cycles/kernel')
| -rw-r--r-- | intern/cycles/kernel/kernel_shader.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/intern/cycles/kernel/kernel_shader.h b/intern/cycles/kernel/kernel_shader.h index 0789031f44f..d573270fd76 100644 --- a/intern/cycles/kernel/kernel_shader.h +++ b/intern/cycles/kernel/kernel_shader.h @@ -299,6 +299,10 @@ ccl_device_inline void shader_setup_from_sample(KernelGlobals *kg, sd->ob_tfm = lamp_fetch_transform(kg, lamp, false); sd->ob_itfm = lamp_fetch_transform(kg, lamp, true); sd->lamp = lamp; +#else + } + else if(lamp != LAMP_NONE) { + sd->lamp = lamp; #endif } |