diff options
author | Jacek Antonelli | 2008-08-15 23:45:49 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:45:49 -0500 |
commit | 8538c0f35dc5fb780f02930256e627e5266ede4a (patch) | |
tree | 58950646aae6534fafe680a5cf879d01cd99d254 /linden/indra/newview/lltexlayer.cpp | |
parent | Second Life viewer sources 1.20.5 (diff) | |
download | meta-impy-8538c0f35dc5fb780f02930256e627e5266ede4a.zip meta-impy-8538c0f35dc5fb780f02930256e627e5266ede4a.tar.gz meta-impy-8538c0f35dc5fb780f02930256e627e5266ede4a.tar.bz2 meta-impy-8538c0f35dc5fb780f02930256e627e5266ede4a.tar.xz |
Second Life viewer sources 1.20.6
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/lltexlayer.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/linden/indra/newview/lltexlayer.cpp b/linden/indra/newview/lltexlayer.cpp index 5a0a843..66d9a33 100644 --- a/linden/indra/newview/lltexlayer.cpp +++ b/linden/indra/newview/lltexlayer.cpp | |||
@@ -244,8 +244,6 @@ BOOL LLTexLayerSetBuffer::render() | |||
244 | BOOL upload_now = (gAgent.mNumPendingQueries == 0 && mNeedsUpload && mTexLayerSet->isLocalTextureDataFinal()); | 244 | BOOL upload_now = (gAgent.mNumPendingQueries == 0 && mNeedsUpload && mTexLayerSet->isLocalTextureDataFinal()); |
245 | BOOL success = TRUE; | 245 | BOOL success = TRUE; |
246 | 246 | ||
247 | gGL.start(); | ||
248 | |||
249 | // Composite bump | 247 | // Composite bump |
250 | if( mBumpTexName ) | 248 | if( mBumpTexName ) |
251 | { | 249 | { |
@@ -297,8 +295,6 @@ BOOL LLTexLayerSetBuffer::render() | |||
297 | glColorMask( GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE ); | 295 | glColorMask( GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE ); |
298 | gGL.blendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA ); | 296 | gGL.blendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA ); |
299 | 297 | ||
300 | gGL.stop(); | ||
301 | |||
302 | // we have valid texture data now | 298 | // we have valid texture data now |
303 | mInitialized = TRUE; | 299 | mInitialized = TRUE; |
304 | mNeedsUpdate = FALSE; | 300 | mNeedsUpdate = FALSE; |