diff options
| author | Geenz <geenz@geenzo.com> | 2013-04-15 01:35:21 -0400 |
|---|---|---|
| committer | Geenz <geenz@geenzo.com> | 2013-04-15 01:35:21 -0400 |
| commit | 6257a8394c23b518febdf5ec9c9ecbdce224e046 (patch) | |
| tree | c2a0d5300cf030fd58622d49d8036b59b73df73d /indra/newview/lldrawpoolalpha.cpp | |
| parent | 66b4900e70db9bf6244faee0bcde63060302f9fe (diff) | |
Normal mapped alpha support. Specular and environment map support needs a bit of extra work (in progress).
Diffstat (limited to 'indra/newview/lldrawpoolalpha.cpp')
| -rw-r--r-- | indra/newview/lldrawpoolalpha.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lldrawpoolalpha.cpp b/indra/newview/lldrawpoolalpha.cpp index d506e57609..3159fa48b8 100644 --- a/indra/newview/lldrawpoolalpha.cpp +++ b/indra/newview/lldrawpoolalpha.cpp @@ -499,7 +499,7 @@ void LLDrawPoolAlpha::renderAlpha(U32 mask) current_shader->bindTexture(LLShaderMgr::BUMP_MAP, params.mNormalMap); } else { LLViewerFetchedTexture::sFlatNormalImagep->addTextureStats(params.mVSize); - current_shader->bindTexture(LLShaderMgr::BUMP_MAP, params.mNormalMap); + current_shader->bindTexture(LLShaderMgr::BUMP_MAP, LLViewerFetchedTexture::sFlatNormalImagep); } if (params.mSpecularMap) @@ -521,7 +521,7 @@ void LLDrawPoolAlpha::renderAlpha(U32 mask) current_shader->uniform1f(LLShaderMgr::ENVIRONMENT_INTENSITY, 0.0f); LLViewerFetchedTexture::sFlatNormalImagep->addTextureStats(params.mVSize); - current_shader->bindTexture(LLShaderMgr::BUMP_MAP, params.mNormalMap); + current_shader->bindTexture(LLShaderMgr::BUMP_MAP, LLViewerFetchedTexture::sFlatNormalImagep); LLViewerFetchedTexture::sWhiteImagep->addTextureStats(params.mVSize); current_shader->bindTexture(LLShaderMgr::SPECULAR_MAP, LLViewerFetchedTexture::sWhiteImagep); |