Merge branch 'master' of https://github.com/Lirusaito/SingularityViewer.git

indra/newview/pipeline.cpp

@@ -934,6 +934,23 @@ bool LLPipeline::isRenderDeferredDesired()
 		gSavedSettings.getBOOL("WindLightUseAtmosShaders");
 }
 
+//static
+void LLPipeline::updateRenderDeferred()
+{
+	bool deferred = (bool(LLRenderTarget::sUseFBO &&
+					 LLFeatureManager::getInstance()->isFeatureAvailable("RenderDeferred") &&	 
+					 LLPipeline::sRenderBump &&
+					 isRenderDeferredDesired())) &&
+					!gUseWireframe;
+
+	sRenderDeferred = deferred;	
+	if (deferred)
+	{ //must render glow when rendering deferred since post effect pass is needed to present any lighting at all
+		sRenderGlow = true;
+	}
+}
+
+
 //static
 void LLPipeline::refreshCachedSettings()
 {