diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-12-21 16:49:39 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-12-21 16:49:39 -0500 |
| commit | d0d647d4eda1d8202e4c076370a24d8fd9fc5c0e (patch) | |
| tree | 3626ea9746652e9fa702ca59a30957cbb5c0d9f7 /indra/newview/pipeline.cpp | |
| parent | c26034531a25590e718edc4d7efa41c04aa42731 (diff) | |
| parent | 89eab35b8069c3e2652591c0dffe2b0214fc0666 (diff) | |
automated merge viewer2.0->viewer2.0
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 |