diff options
Diffstat (limited to 'linden/indra/newview/lldrawpoolbump.cpp')
-rw-r--r-- | linden/indra/newview/lldrawpoolbump.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/linden/indra/newview/lldrawpoolbump.cpp b/linden/indra/newview/lldrawpoolbump.cpp index 8f5858f..ff464f7 100644 --- a/linden/indra/newview/lldrawpoolbump.cpp +++ b/linden/indra/newview/lldrawpoolbump.cpp | |||
@@ -309,8 +309,8 @@ void LLDrawPoolBump::endRenderPass(S32 pass) | |||
309 | void LLDrawPoolBump::beginShiny(bool invisible) | 309 | void LLDrawPoolBump::beginShiny(bool invisible) |
310 | { | 310 | { |
311 | LLFastTimer t(LLFastTimer::FTM_RENDER_SHINY); | 311 | LLFastTimer t(LLFastTimer::FTM_RENDER_SHINY); |
312 | if (!invisible && !gPipeline.hasRenderBatches(LLRenderPass::PASS_SHINY)|| | 312 | if ((!invisible && !gPipeline.hasRenderBatches(LLRenderPass::PASS_SHINY))|| |
313 | invisible && !gPipeline.hasRenderBatches(LLRenderPass::PASS_INVISI_SHINY)) | 313 | (invisible && !gPipeline.hasRenderBatches(LLRenderPass::PASS_INVISI_SHINY))) |
314 | { | 314 | { |
315 | return; | 315 | return; |
316 | } | 316 | } |
@@ -384,8 +384,8 @@ void LLDrawPoolBump::beginShiny(bool invisible) | |||
384 | void LLDrawPoolBump::renderShiny(bool invisible) | 384 | void LLDrawPoolBump::renderShiny(bool invisible) |
385 | { | 385 | { |
386 | LLFastTimer t(LLFastTimer::FTM_RENDER_SHINY); | 386 | LLFastTimer t(LLFastTimer::FTM_RENDER_SHINY); |
387 | if (!invisible && !gPipeline.hasRenderBatches(LLRenderPass::PASS_SHINY)|| | 387 | if ((!invisible && !gPipeline.hasRenderBatches(LLRenderPass::PASS_SHINY))|| |
388 | invisible && !gPipeline.hasRenderBatches(LLRenderPass::PASS_INVISI_SHINY)) | 388 | (invisible && !gPipeline.hasRenderBatches(LLRenderPass::PASS_INVISI_SHINY))) |
389 | { | 389 | { |
390 | return; | 390 | return; |
391 | } | 391 | } |
@@ -411,8 +411,8 @@ void LLDrawPoolBump::renderShiny(bool invisible) | |||
411 | void LLDrawPoolBump::endShiny(bool invisible) | 411 | void LLDrawPoolBump::endShiny(bool invisible) |
412 | { | 412 | { |
413 | LLFastTimer t(LLFastTimer::FTM_RENDER_SHINY); | 413 | LLFastTimer t(LLFastTimer::FTM_RENDER_SHINY); |
414 | if (!invisible && !gPipeline.hasRenderBatches(LLRenderPass::PASS_SHINY)|| | 414 | if ((!invisible && !gPipeline.hasRenderBatches(LLRenderPass::PASS_SHINY))|| |
415 | invisible && !gPipeline.hasRenderBatches(LLRenderPass::PASS_INVISI_SHINY)) | 415 | (invisible && !gPipeline.hasRenderBatches(LLRenderPass::PASS_INVISI_SHINY))) |
416 | { | 416 | { |
417 | return; | 417 | return; |
418 | } | 418 | } |
@@ -1221,7 +1221,7 @@ void LLDrawPoolBump::pushBatch(LLDrawInfo& params, U32 mask, BOOL texture) | |||
1221 | if (params.mTexture.notNull()) | 1221 | if (params.mTexture.notNull()) |
1222 | { | 1222 | { |
1223 | gGL.getTexUnit(diffuse_channel)->bind(params.mTexture.get()); | 1223 | gGL.getTexUnit(diffuse_channel)->bind(params.mTexture.get()); |
1224 | params.mTexture->addTextureStats(params.mVSize); | 1224 | //params.mTexture->addTextureStats(params.mVSize); |
1225 | } | 1225 | } |
1226 | else | 1226 | else |
1227 | { | 1227 | { |