diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-08-19 16:34:34 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-08-19 16:34:34 -0500 |
| commit | 233e42b3314c17b2e24334587d960af6e3dc963c (patch) | |
| tree | 480e571bf913bb0743c3c6c6ce846a69aa405504 /indra/newview/lldrawpoolsky.cpp | |
| parent | 0e496309d6cb7581c9f69b7da244699c382750ac (diff) | |
| parent | 80398b3ccb0c4a6ff3ac20b3565619fe5cecc2f9 (diff) | |
merge
Diffstat (limited to 'indra/newview/lldrawpoolsky.cpp')
| -rw-r--r-- | indra/newview/lldrawpoolsky.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/lldrawpoolsky.cpp b/indra/newview/lldrawpoolsky.cpp index efffb2df9e..d1c8fa5fc9 100644 --- a/indra/newview/lldrawpoolsky.cpp +++ b/indra/newview/lldrawpoolsky.cpp @@ -84,7 +84,7 @@ void LLDrawPoolSky::render(S32 pass) } else if (LLGLSLShader::sNoFixedFunction) { //just use the UI shader (generic single texture no lighting) - gUIProgram.bind(); + gOneTextureNoColorProgram.bind(); } else { @@ -118,7 +118,7 @@ void LLDrawPoolSky::render(S32 pass) S32 face_count = (S32)mDrawFace.size(); LLVertexBuffer::unbind(); - glColor4f(1,1,1,1); + gGL.diffuseColor4f(1,1,1,1); for (S32 i = 0; i < llmin(6, face_count); ++i) { @@ -146,7 +146,7 @@ void LLDrawPoolSky::renderSkyCubeFace(U8 side) LLGLEnable blend(GL_BLEND); mSkyTex[side].bindTexture(FALSE); - glColor4f(1, 1, 1, LLSkyTex::getInterpVal()); // lighting is disabled + gGL.diffuseColor4f(1, 1, 1, LLSkyTex::getInterpVal()); // lighting is disabled face.renderIndexed(); } } |