summaryrefslogtreecommitdiff
path: root/indra/newview/lldrawpoolbump.cpp
diff options
context:
space:
mode:
authordavep@billy.gateway.2wire.net <davep@billy.gateway.2wire.net>2010-02-09 11:23:33 -0600
committerdavep@billy.gateway.2wire.net <davep@billy.gateway.2wire.net>2010-02-09 11:23:33 -0600
commit6d4b4762d1eb0a1431e1793a7254f8cac220062a (patch)
tree1076c9227658d6637a424f9266bf3832f371aaaa /indra/newview/lldrawpoolbump.cpp
parentbc7f2e41fd268895774f9ddffd45be318662dcaa (diff)
parent4d9bcc2c8f303464c3664a0a7304a1bc2d658e2e (diff)
merge
Diffstat (limited to 'indra/newview/lldrawpoolbump.cpp')
-rw-r--r--indra/newview/lldrawpoolbump.cpp12
1 files changed, 12 insertions, 0 deletions
diff --git a/indra/newview/lldrawpoolbump.cpp b/indra/newview/lldrawpoolbump.cpp
index d09d4a412f..a4a8dc80b5 100644
--- a/indra/newview/lldrawpoolbump.cpp
+++ b/indra/newview/lldrawpoolbump.cpp
@@ -701,6 +701,18 @@ void LLDrawPoolBump::endBump()
gGL.setSceneBlendType(LLRender::BT_ALPHA);
}
+S32 LLDrawPoolBump::getNumDeferredPasses()
+{
+ if (gSavedSettings.getBOOL("RenderObjectBump"))
+ {
+ return 1;
+ }
+ else
+ {
+ return 0;
+ }
+}
+
void LLDrawPoolBump::beginDeferredPass(S32 pass)
{
if (!gPipeline.hasRenderBatches(LLRenderPass::PASS_BUMP))