diff options
author | Jacek Antonelli | 2009-01-11 16:10:39 -0600 |
---|---|---|
committer | Jacek Antonelli | 2009-01-11 16:10:43 -0600 |
commit | a87e38229921b48c32187c672a942516722f1b52 (patch) | |
tree | 9e1dc0bc2318a9c6fa454bdb6d873a6af0e0ce3c /linden/indra/newview/lldrawpoolbump.cpp | |
parent | Second Life viewer sources 1.22.4-RC (diff) | |
download | meta-impy-a87e38229921b48c32187c672a942516722f1b52.zip meta-impy-a87e38229921b48c32187c672a942516722f1b52.tar.gz meta-impy-a87e38229921b48c32187c672a942516722f1b52.tar.bz2 meta-impy-a87e38229921b48c32187c672a942516722f1b52.tar.xz |
Second Life viewer sources 1.22.5-RC
Diffstat (limited to 'linden/indra/newview/lldrawpoolbump.cpp')
-rw-r--r-- | linden/indra/newview/lldrawpoolbump.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/linden/indra/newview/lldrawpoolbump.cpp b/linden/indra/newview/lldrawpoolbump.cpp index 6593547..6221bc8 100644 --- a/linden/indra/newview/lldrawpoolbump.cpp +++ b/linden/indra/newview/lldrawpoolbump.cpp | |||
@@ -4,7 +4,7 @@ | |||
4 | * | 4 | * |
5 | * $LicenseInfo:firstyear=2003&license=viewergpl$ | 5 | * $LicenseInfo:firstyear=2003&license=viewergpl$ |
6 | * | 6 | * |
7 | * Copyright (c) 2003-2008, Linden Research, Inc. | 7 | * Copyright (c) 2003-2009, Linden Research, Inc. |
8 | * | 8 | * |
9 | * Second Life Viewer Source Code | 9 | * Second Life Viewer Source Code |
10 | * The source code in this file ("Source Code") is provided by Linden Lab | 10 | * The source code in this file ("Source Code") is provided by Linden Lab |
@@ -73,7 +73,6 @@ const U32 VERTEX_MASK_SHINY = LLVertexBuffer::MAP_VERTEX | LLVertexBuffer::MAP_N | |||
73 | const U32 VERTEX_MASK_BUMP = LLVertexBuffer::MAP_VERTEX |LLVertexBuffer::MAP_TEXCOORD | LLVertexBuffer::MAP_TEXCOORD2; | 73 | const U32 VERTEX_MASK_BUMP = LLVertexBuffer::MAP_VERTEX |LLVertexBuffer::MAP_TEXCOORD | LLVertexBuffer::MAP_TEXCOORD2; |
74 | 74 | ||
75 | U32 LLDrawPoolBump::sVertexMask = VERTEX_MASK_SHINY; | 75 | U32 LLDrawPoolBump::sVertexMask = VERTEX_MASK_SHINY; |
76 | static LLPointer<LLCubeMap> sCubeMap; | ||
77 | 76 | ||
78 | static LLGLSLShader* shader = NULL; | 77 | static LLGLSLShader* shader = NULL; |
79 | static S32 cube_channel = -1; | 78 | static S32 cube_channel = -1; |
@@ -388,8 +387,6 @@ void LLDrawPoolBump::renderShiny(bool invisible) | |||
388 | return; | 387 | return; |
389 | } | 388 | } |
390 | 389 | ||
391 | sCubeMap = NULL; | ||
392 | |||
393 | if( gSky.mVOSkyp->getCubeMap() ) | 390 | if( gSky.mVOSkyp->getCubeMap() ) |
394 | { | 391 | { |
395 | LLGLEnable blend_enable(GL_BLEND); | 392 | LLGLEnable blend_enable(GL_BLEND); |
@@ -513,8 +510,6 @@ void LLDrawPoolBump::renderFullbrightShiny() | |||
513 | return; | 510 | return; |
514 | } | 511 | } |
515 | 512 | ||
516 | sCubeMap = NULL; | ||
517 | |||
518 | if( gSky.mVOSkyp->getCubeMap() ) | 513 | if( gSky.mVOSkyp->getCubeMap() ) |
519 | { | 514 | { |
520 | LLGLEnable blend_enable(GL_BLEND); | 515 | LLGLEnable blend_enable(GL_BLEND); |