diff options
| author | Dave Parks <davep@lindenlab.com> | 2013-03-29 20:12:27 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2013-03-29 20:12:27 -0500 |
| commit | 14f02e48b877569539c96ef5f261ac8b3943579f (patch) | |
| tree | 382802d341977dc87f452804ba53062dc4f76c01 /indra/newview/lldrawpoolalpha.cpp | |
| parent | fc4869fb7871632b95dd293157b9965fb2edcb73 (diff) | |
NORSPEC-66 Hook up material parameters to rigged attachments.
Diffstat (limited to 'indra/newview/lldrawpoolalpha.cpp')
| -rw-r--r-- | indra/newview/lldrawpoolalpha.cpp | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/indra/newview/lldrawpoolalpha.cpp b/indra/newview/lldrawpoolalpha.cpp index 24a7939d12..a8abe9a267 100644 --- a/indra/newview/lldrawpoolalpha.cpp +++ b/indra/newview/lldrawpoolalpha.cpp @@ -447,16 +447,19 @@ void LLDrawPoolAlpha::renderAlpha(U32 mask) if (use_shaders) { target_shader = fullbright_shader; - if (LLPipeline::sRenderDeferred) + if (target_shader) { - if (params.mFace->getViewerObject()->isHUDAttachment()) + if (LLPipeline::sRenderDeferred) { - target_shader->uniform1f(LLShaderMgr::TEXTURE_GAMMA, 1.0); + if (params.mFace->getViewerObject()->isHUDAttachment()) + { + target_shader->uniform1f(LLShaderMgr::TEXTURE_GAMMA, 1.0); + } else { + target_shader->uniform1f(LLShaderMgr::TEXTURE_GAMMA, 2.2); + } } else { - target_shader->uniform1f(LLShaderMgr::TEXTURE_GAMMA, 2.2); + target_shader->uniform1f(LLShaderMgr::TEXTURE_GAMMA, 1.0); } - } else { - target_shader->uniform1f(LLShaderMgr::TEXTURE_GAMMA, 1.0); } } else |