diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2009-12-21 17:28:06 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2009-12-21 17:28:06 -0500 |
| commit | 97031cb90dce6ed8468e427abc09c99b290ee08d (patch) | |
| tree | 11b5ceba8856d8535e219c5673c6d005285f2b75 /indra/newview/pipeline.cpp | |
| parent | ced5b819d74fa70fc2050b13749bfe1387340583 (diff) | |
| parent | a32f857fe68f6b191f8029b1a5b137aaa364395b (diff) | |
merge
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 |