diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-07-25 09:49:58 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-07-25 09:49:58 -0400 |
| commit | b8be8820ea52a77df6362179b1dda3fc4a305913 (patch) | |
| tree | 061d59de4c1ccca88aa82ec7381790581f90bee9 /indra/newview/lldrawpoolsky.cpp | |
| parent | e0728065251fbd5f45218eb94c056a92162eb54d (diff) | |
| parent | a5769e81263d6d004033b914c1cbf1a8296923d9 (diff) | |
close head created by 54e071a92450
Diffstat (limited to 'indra/newview/lldrawpoolsky.cpp')
| -rw-r--r-- | indra/newview/lldrawpoolsky.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/lldrawpoolsky.cpp b/indra/newview/lldrawpoolsky.cpp index 030d6e1110..efffb2df9e 100644 --- a/indra/newview/lldrawpoolsky.cpp +++ b/indra/newview/lldrawpoolsky.cpp @@ -82,6 +82,10 @@ void LLDrawPoolSky::render(S32 pass) mShader = &gObjectFullbrightWaterProgram; mShader->bind(); } + else if (LLGLSLShader::sNoFixedFunction) + { //just use the UI shader (generic single texture no lighting) + gUIProgram.bind(); + } else { // don't use shaders! @@ -139,6 +143,7 @@ void LLDrawPoolSky::renderSkyCubeFace(U8 side) if (LLSkyTex::doInterpolate()) { + LLGLEnable blend(GL_BLEND); mSkyTex[side].bindTexture(FALSE); glColor4f(1, 1, 1, LLSkyTex::getInterpVal()); // lighting is disabled |