diff options
Diffstat (limited to 'indra/newview/pipeline.cpp')
| -rwxr-xr-x | indra/newview/pipeline.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index b5fbf08786..05ef8060d4 100755 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -1058,12 +1058,6 @@ void LLPipeline::updateRenderDeferred() { //must render glow when rendering deferred since post effect pass is needed to present any lighting at all sRenderGlow = TRUE; } - - if (LLRenderTarget::sUseFBO && !sRenderDeferred) - { //this case should never happen, but some odd startup state can cause it to - LLRenderTarget::sUseFBO = FALSE; - } - } //static @@ -1730,10 +1724,10 @@ U32 LLPipeline::getPoolTypeFromTE(const LLTextureEntry* te, LLViewerTexture* ima { return LLDrawPool::POOL_ALPHA; } - else if ((te->getBumpmap() || te->getShiny()) && te->getMaterialID().isNull()) + else if ((te->getBumpmap() || te->getShiny()) && !te->getMaterialParams().isNull()) { return LLDrawPool::POOL_BUMP; - } else if (!te->getMaterialID().isNull() && !alpha) + } else if (!te->getMaterialParams().isNull() && !alpha) { return LLDrawPool::POOL_MATERIALS; } |