diff options
| author | Dave Parks <davep@lindenlab.com> | 2013-06-21 12:51:29 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2013-06-21 12:51:29 -0500 |
| commit | 79029149a415a9f32e08d378653199a880d21e65 (patch) | |
| tree | 14b6f7d59c66602affd77b6e21f1981b28995fa8 /indra/newview/lldrawpoolterrain.cpp | |
| parent | 80552a465e9169b7326c346f4685790ea459823a (diff) | |
| parent | 8511385a5407181ced7bb226d4054185c597d05e (diff) | |
Automated merge with file:///F:%5Cviewer-bear
Diffstat (limited to 'indra/newview/lldrawpoolterrain.cpp')
| -rwxr-xr-x | indra/newview/lldrawpoolterrain.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/lldrawpoolterrain.cpp b/indra/newview/lldrawpoolterrain.cpp index 0adb42428d..c3ec234223 100755 --- a/indra/newview/lldrawpoolterrain.cpp +++ b/indra/newview/lldrawpoolterrain.cpp @@ -354,8 +354,8 @@ void LLDrawPoolTerrain::renderFullShader() LLGLSLShader* shader = LLGLSLShader::sCurBoundShaderPtr; llassert(shader); - shader->uniform4fv("object_plane_s", 1, tp0.mV); - shader->uniform4fv("object_plane_t", 1, tp1.mV); + shader->uniform4fv(LLShaderMgr::OBJECT_PLANE_S, 1, tp0.mV); + shader->uniform4fv(LLShaderMgr::OBJECT_PLANE_T, 1, tp1.mV); gGL.matrixMode(LLRender::MM_TEXTURE); gGL.loadIdentity(); @@ -864,8 +864,8 @@ void LLDrawPoolTerrain::renderSimple() if (LLGLSLShader::sNoFixedFunction) { - sShader->uniform4fv("object_plane_s", 1, tp0.mV); - sShader->uniform4fv("object_plane_t", 1, tp1.mV); + sShader->uniform4fv(LLShaderMgr::OBJECT_PLANE_S, 1, tp0.mV); + sShader->uniform4fv(LLShaderMgr::OBJECT_PLANE_T, 1, tp1.mV); } else { |