diff options
| author | Baker Linden <baker@lindenlab.com> | 2013-12-18 18:25:47 -0500 |
|---|---|---|
| committer | Baker Linden <baker@lindenlab.com> | 2013-12-18 18:25:47 -0500 |
| commit | 3c521d8207092f1c48e158082b88c5e81cc9c440 (patch) | |
| tree | 36a18cfaed8fc4e3ee2a84604f3876832522e529 /indra/newview/lldrawpoolterrain.cpp | |
| parent | 74707f0057c05dc4dd439302e64fe29e8ed91a32 (diff) | |
| parent | 1a9b9f1bd1b5f64b35b9ce6eff458cdb7a79fe6e (diff) | |
viewer-release merge
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 { |