summaryrefslogtreecommitdiff
path: root/indra/newview/lldrawpoolalpha.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2011-05-04 16:44:26 -0500
committerDave Parks <davep@lindenlab.com>2011-05-04 16:44:26 -0500
commitfa210390b06b6f8e9849372d59ac616679bc2930 (patch)
treecfa148d8b350281ba64327af3279b025a97b536e /indra/newview/lldrawpoolalpha.cpp
parent91980918f0341bec0145156875d22503e8beea4e (diff)
parent5d33a55c08be0a2bd1a5f6185039754ed46379d0 (diff)
merge
Diffstat (limited to 'indra/newview/lldrawpoolalpha.cpp')
-rw-r--r--indra/newview/lldrawpoolalpha.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/lldrawpoolalpha.cpp b/indra/newview/lldrawpoolalpha.cpp
index 2cfd3b0a33..8b5a2ce781 100644
--- a/indra/newview/lldrawpoolalpha.cpp
+++ b/indra/newview/lldrawpoolalpha.cpp
@@ -107,10 +107,14 @@ S32 LLDrawPoolAlpha::getNumPostDeferredPasses()
{ //skip depth buffer filling pass when rendering impostors
return 1;
}
- else
+ else if (gSavedSettings.getBOOL("RenderDepthOfField"))
{
return 2;
}
+ else
+ {
+ return 1;
+ }
}
void LLDrawPoolAlpha::beginPostDeferredPass(S32 pass)