Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials

1 files changed, 6 insertions, 0 deletions

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