diff options
| author | dolphin <dolphin@lindenlab.com> | 2013-10-04 09:19:25 -0700 |
|---|---|---|
| committer | dolphin <dolphin@lindenlab.com> | 2013-10-04 09:19:25 -0700 |
| commit | c2c060d4401d3a79a9ae0076af0c9b86d14f7f37 (patch) | |
| tree | b7efcf3c2e38aa9de488342b3379b4bde0a6bc47 /indra/newview/lldrawpoolterrain.cpp | |
| parent | d44c85c6dc575c0c67019ce1bffecfaa5bc275d1 (diff) | |
| parent | f7158bc5afcec1da8b9d2d5a4ed86921e62d4959 (diff) | |
Merge with 3.6.7
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 { |