diff options
| author | Mark Palange <palange@lindenlab.com> | 2009-01-13 03:46:56 +0000 |
|---|---|---|
| committer | Mark Palange <palange@lindenlab.com> | 2009-01-13 03:46:56 +0000 |
| commit | 446c55538e1fb12d8a1feb541edf99c16bb29121 (patch) | |
| tree | 022ca3c10bd2e0326098719cdffb65f9465ab08f /indra/newview/lldrawpoolbump.cpp | |
| parent | 5476aca88e4b34d4d145f3a0b04fce95402c7b1f (diff) | |
svn merge -r106055-107012 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer_1-22/
merge RC5 changes into trunk, plus add'l localization xml (all newly added) files that should have been added with RC0-RC4 merge, but weren't.
Diffstat (limited to 'indra/newview/lldrawpoolbump.cpp')
| -rw-r--r-- | indra/newview/lldrawpoolbump.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/indra/newview/lldrawpoolbump.cpp b/indra/newview/lldrawpoolbump.cpp index 6d6e4b0617..b23819be27 100644 --- a/indra/newview/lldrawpoolbump.cpp +++ b/indra/newview/lldrawpoolbump.cpp @@ -74,7 +74,6 @@ const U32 VERTEX_MASK_SHINY = LLVertexBuffer::MAP_VERTEX | LLVertexBuffer::MAP_N const U32 VERTEX_MASK_BUMP = LLVertexBuffer::MAP_VERTEX |LLVertexBuffer::MAP_TEXCOORD | LLVertexBuffer::MAP_TEXCOORD2; U32 LLDrawPoolBump::sVertexMask = VERTEX_MASK_SHINY; -static LLPointer<LLCubeMap> sCubeMap; static LLGLSLShader* shader = NULL; static S32 cube_channel = -1; @@ -389,8 +388,6 @@ void LLDrawPoolBump::renderShiny(bool invisible) return; } - sCubeMap = NULL; - if( gSky.mVOSkyp->getCubeMap() ) { LLGLEnable blend_enable(GL_BLEND); @@ -514,8 +511,6 @@ void LLDrawPoolBump::renderFullbrightShiny() return; } - sCubeMap = NULL; - if( gSky.mVOSkyp->getCubeMap() ) { LLGLEnable blend_enable(GL_BLEND); |