diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-10-14 17:25:24 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-10-14 17:25:24 -0700 |
| commit | f6c7b906e1f1d1bcc56a1e71b1867a58c5b2381a (patch) | |
| tree | ec9226508d7a3e1555b774fde915a8b299b35cd7 /indra/newview/lldrawpoolavatar.cpp | |
| parent | c2f5365f986aab49d5c7cfa2834a68f5b35c09c2 (diff) | |
| parent | 04b84ce07dd5bc8364f948ef0004e3dc5328f1b4 (diff) | |
Pull merge with lindenlab/viewer-bear
Diffstat (limited to 'indra/newview/lldrawpoolavatar.cpp')
| -rwxr-xr-x | indra/newview/lldrawpoolavatar.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lldrawpoolavatar.cpp b/indra/newview/lldrawpoolavatar.cpp index ba8c449c3d..f622d5a63a 100755 --- a/indra/newview/lldrawpoolavatar.cpp +++ b/indra/newview/lldrawpoolavatar.cpp @@ -697,7 +697,7 @@ void LLDrawPoolAvatar::beginDeferredImpostor() specular_channel = sVertexProgram->enableTexture(LLViewerShaderMgr::SPECULAR_MAP); normal_channel = sVertexProgram->enableTexture(LLViewerShaderMgr::DEFERRED_NORMAL); sDiffuseChannel = sVertexProgram->enableTexture(LLViewerShaderMgr::DIFFUSE_MAP); - gPipeline.bindDeferredShader(*sVertexProgram); + sVertexProgram->bind(); sVertexProgram->setMinimumAlpha(0.01f); } |