diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-07-18 14:18:51 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-07-18 14:18:51 +0400 |
| commit | 4a999f9e96965bd4aa45ce4cdd5c225bbf901226 (patch) | |
| tree | 0d53aaf826a8517e53d89f9b69ddd29e96549a88 /intern/cycles/kernel/kernel_light.h | |
| parent | 352c1e500da111989d2d7847fd6a6b9a130c5de4 (diff) | |
| parent | 530bcc422e97afa18ac998aa5ecd11e8e9560c55 (diff) | |
Merging r58341 through r58364 from trunk into blender-2.68-releasev2.68
Diffstat (limited to 'intern/cycles/kernel/kernel_light.h')
| -rw-r--r-- | intern/cycles/kernel/kernel_light.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/kernel/kernel_light.h b/intern/cycles/kernel/kernel_light.h index 4983122fb34..5091eac41db 100644 --- a/intern/cycles/kernel/kernel_light.h +++ b/intern/cycles/kernel/kernel_light.h @@ -271,7 +271,7 @@ __device void lamp_light_sample(KernelGlobals *kg, int lamp, ls->pdf = invarea; if(type == LIGHT_SPOT) { - /* spot light attentuation */ + /* spot light attenuation */ float4 data2 = kernel_tex_fetch(__light_data, lamp*LIGHT_SIZE + 2); ls->eval_fac *= spot_light_attenuation(data1, data2, ls); } |