diff options
| author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-07-25 11:56:49 -0400 |
|---|---|---|
| committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-07-25 11:56:49 -0400 |
| commit | 6a15da0133aac12f3223d91078d133d50e7d44ee (patch) | |
| tree | fadafea4c31ed6c56560cd2126214486a231ab6d /indra/newview/lldrawpoolsky.cpp | |
| parent | 0e3cea49aaba7fb9e4a75c4a76779ba9273549bf (diff) | |
| parent | 723d05e6df1d89b8957aca429b1328834f323150 (diff) | |
merged .hgtags
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 |