diff options
| author | Rider Linden <rider@lindenlab.com> | 2019-02-04 21:32:57 +0000 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2019-02-04 21:32:57 +0000 |
| commit | db01f4bb2bce97f76058bbf912cb48c985c3e10a (patch) | |
| tree | d9f92d13b5084964f941e854985413edffc04740 /indra/newview/pipeline.cpp | |
| parent | 0b5c452fd991648f9a5c55eb6865deda5cc1f0a4 (diff) | |
| parent | 9a007cceeffb1b960ba495cd0e3d592698a52a99 (diff) | |
Merged in graham_linden/viewer-eep-fixes (pull request #263)
SL-10459, SL-10461
Diffstat (limited to 'indra/newview/pipeline.cpp')
| -rw-r--r-- | indra/newview/pipeline.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 73e2bd5ec0..82c59282d5 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -6482,7 +6482,9 @@ void LLPipeline::setupHWLights(LLDrawPool* pool) light_state->setSpotCutoff(90.f); light_state->setSpotExponent(2.f); - const LLColor4 specular(0.f, 0.f, 0.f, 0.f); + LLVector3 spotParams = light->getSpotLightParams(); + + const LLColor4 specular(0.f, 0.f, 0.f, spotParams[2]); light_state->setSpecular(specular); } else // omnidirectional (point) light @@ -6491,8 +6493,8 @@ void LLPipeline::setupHWLights(LLDrawPool* pool) light_state->setSpotCutoff(180.f); // we use specular.w = 1.0 as a cheap hack for the shaders to know that this is omnidirectional rather than a spotlight - const LLColor4 specular(0.f, 0.f, 0.f, 1.f); - light_state->setSpecular(specular); + const LLColor4 specular(0.f, 0.f, 1.f, 0.f); + light_state->setSpecular(specular); } cur_light++; if (cur_light >= 8) |