diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2017-02-02 23:50:12 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2017-02-02 23:50:12 +0300 |
| commit | d85295534b6dad80b9c0db32708f7318ef79e134 (patch) | |
| tree | aa317d5ce63509aa5bf20f2db1ed159d4961c733 /source/blender/gpu/intern/gpu_material.c | |
| parent | 47b21dd4c6768e0410e4a73350be75bfb1123188 (diff) | |
| parent | 9f67367f0aae46f022adb9b47d91c01b35ab9b0f (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/gpu/intern/gpu_material.c')
| -rw-r--r-- | source/blender/gpu/intern/gpu_material.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/gpu/intern/gpu_material.c b/source/blender/gpu/intern/gpu_material.c index 56b7af787e7..b42efcca6b1 100644 --- a/source/blender/gpu/intern/gpu_material.c +++ b/source/blender/gpu/intern/gpu_material.c @@ -609,7 +609,7 @@ static GPUNodeLink *lamp_get_visibility(GPUMaterial *mat, GPULamp *lamp, GPUNode GPU_link(mat, "lamp_visibility_spot", GPU_dynamic_uniform(&lamp->spotsi, GPU_DYNAMIC_LAMP_SPOTSIZE, lamp->ob), - GPU_dynamic_uniform(&lamp->spotbl, GPU_DYNAMIC_LAMP_SPOTSIZE, lamp->ob), + GPU_dynamic_uniform(&lamp->spotbl, GPU_DYNAMIC_LAMP_SPOTBLEND, lamp->ob), inpr, visifac, &visifac); } |