From 471182e9131b6ea563600900ba7dac03753aed1a Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Tue, 11 Jun 2013 16:26:57 -0500 Subject: NORSPEC-259 Fix for crash in LLRenderTarget::copyContentsToFramebuffer --- indra/newview/pipeline.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'indra/newview') diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index c144a07512..b5fbf08786 100755 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -1058,6 +1058,12 @@ 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 -- cgit v1.2.3