diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-12-02 01:23:46 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-12-02 01:23:46 -0600 |
| commit | d06c9fba902b16db6906790bab349c6a01fc04ad (patch) | |
| tree | 8c47436f45454b2a5473449202b13f4447ff56ff | |
| parent | 3083830d2105b420ba152e43018f3c88240bc310 (diff) | |
SH-437 Fix for crash when setting RenderGlow to FALSE when deferred rendering is on.
| -rw-r--r-- | indra/newview/pipeline.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 78d1044ff3..b538969164 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -740,7 +740,11 @@ void LLPipeline::updateRenderDeferred() gSavedSettings.getBOOL("WindLightUseAtmosShaders")) ? TRUE : FALSE) && !gUseWireframe; - sRenderDeferred = deferred; + sRenderDeferred = deferred; + if (deferred) + { //must render glow when rendering deferred since post effect pass is needed to present any lighting at all + sRenderGlow = TRUE; + } } void LLPipeline::releaseGLBuffers() @@ -833,7 +837,6 @@ void LLPipeline::createGLBuffers() allocateScreenBuffer(resX,resY); mScreenWidth = 0; mScreenHeight = 0; - } if (sRenderDeferred) |