diff options
| author | Dave Parks <davep@lindenlab.com> | 2013-05-30 11:06:16 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2013-05-30 11:06:16 -0500 |
| commit | 4a1b6bdeef3753a65cb11ccbad151560da508e15 (patch) | |
| tree | ad5c7a192f2438805ab924f21da5b4664bb2f949 /indra/newview/lldrawpoolmaterials.cpp | |
| parent | 7931cac194944518047dac73a6c01c20aa7b3a18 (diff) | |
| parent | ee4c2e837bd9b414997ba75e823ac533fc4b82bc (diff) | |
Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials
Diffstat (limited to 'indra/newview/lldrawpoolmaterials.cpp')
| -rw-r--r-- | indra/newview/lldrawpoolmaterials.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/lldrawpoolmaterials.cpp b/indra/newview/lldrawpoolmaterials.cpp index 3e0f9c9d4d..08a36bddf1 100644 --- a/indra/newview/lldrawpoolmaterials.cpp +++ b/indra/newview/lldrawpoolmaterials.cpp @@ -139,6 +139,7 @@ void LLDrawPoolMaterials::renderDeferred(S32 pass) } mShader->setMinimumAlpha(params.mAlphaMaskCutoff); + mShader->uniform1f(LLShaderMgr::EMISSIVE_BRIGHTNESS, params.mFullbright ? 1.f : 0.f); pushBatch(params, mask, TRUE); } |