diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-10-04 11:27:59 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-10-04 11:27:59 -0700 |
| commit | 98a89748789034a53f129e19d06649d79b384c52 (patch) | |
| tree | 39a1aefb35402db02c8791bc3e5735c36116f426 /indra/newview/lldrawpoolterrain.cpp | |
| parent | 796be733b374beb5660ee2713fc28c4e69331cbd (diff) | |
| parent | 1e32b9dd33fb9e2f0d9a7935a3696b423a191354 (diff) | |
Pull merge from viewer-fbc
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 { |