diff options
| author | Igor Borovkov <iborovkov@productengine.com> | 2009-12-22 17:49:35 +0200 |
|---|---|---|
| committer | Igor Borovkov <iborovkov@productengine.com> | 2009-12-22 17:49:35 +0200 |
| commit | 191e5f9ca033cd1520950f35309c0bc2c4499803 (patch) | |
| tree | 684ccc50f33104413f9c52fe2ee4c3302ec77bb6 /indra/newview/pipeline.cpp | |
| parent | 304e321f89e9a517ba90d6b41999a65591639ad9 (diff) | |
| parent | d4a8f4c6efd11b4cb3ccba320f18e8508668b915 (diff) | |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/pipeline.cpp')
| -rw-r--r-- | indra/newview/pipeline.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 73b5222ee3..4f4fc83819 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -6352,7 +6352,8 @@ void LLPipeline::renderDeferredLighting() mDeferredLight[0].flush(); - if (gSavedSettings.getBOOL("RenderDeferredBlurLight")) + if (gSavedSettings.getBOOL("RenderDeferredBlurLight") && + gSavedSettings.getBOOL("RenderDeferredGI")) { LLFastTimer ftm(FTM_EDGE_DETECTION); //get edge map |