diff options
| author | Brad Kittenbrink <brad@lindenlab.com> | 2008-02-27 18:58:14 +0000 |
|---|---|---|
| committer | Brad Kittenbrink <brad@lindenlab.com> | 2008-02-27 18:58:14 +0000 |
| commit | 6d52efe452aa8469e0343da1c7d108f3f52ab651 (patch) | |
| tree | a87be48e9840d7fc1f7ee514d7c7f994e71fdb3c /indra/newview/lldrawpoolground.cpp | |
| parent | 6027ad2630b8650cabcf00628ee9b0d25bedd67f (diff) | |
Merge of windlight into release (QAR-286). This includes all changes in
windlight14 which have passed QA (up through r79932).
svn merge -r 80831:80833 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge_windlight14_r80620
Diffstat (limited to 'indra/newview/lldrawpoolground.cpp')
| -rw-r--r-- | indra/newview/lldrawpoolground.cpp | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/indra/newview/lldrawpoolground.cpp b/indra/newview/lldrawpoolground.cpp index d84f0959bf..31c4e4fde9 100644 --- a/indra/newview/lldrawpoolground.cpp +++ b/indra/newview/lldrawpoolground.cpp @@ -72,15 +72,10 @@ void LLDrawPoolGround::render(S32 pass) glEnableClientState(GL_VERTEX_ARRAY); LLGLSPipelineSkyBox gls_skybox; - LLGLDisable tex(GL_TEXTURE_2D); - LLGLDepthTest gls_depth(GL_FALSE, GL_FALSE); + LLImageGL::unbindTexture(0, GL_TEXTURE_2D); + LLGLDepthTest gls_depth(GL_TRUE, GL_FALSE); - glMatrixMode( GL_PROJECTION ); - - glPushMatrix(); - //gViewerWindow->setup3DRender(); - - glMatrixMode(GL_MODELVIEW); + LLGLClampToFarClip far_clip(glh_get_current_projection()); F32 water_height = gAgent.getRegion()->getWaterHeight(); glPushMatrix(); @@ -94,9 +89,6 @@ void LLDrawPoolGround::render(S32 pass) LLOverrideFaceColor col(this, gSky.mVOSkyp->getGLFogColor()); facep->renderIndexed(); - glMatrixMode( GL_PROJECTION ); - glPopMatrix(); - glMatrixMode( GL_MODELVIEW ); glPopMatrix(); } |