From afe0f7ef3d9d69d3170a59885067812ab4ab0d16 Mon Sep 17 00:00:00 2001 From: Salvatore La Bua Date: Sat, 28 Sep 2013 05:15:45 +0200 Subject: [PATCH] Revert "Trees shadow parameters use actual debug settings" This reverts commit 3c5a0efb8daff076d2191b2eb065aca4f466fcf6. --- indra/newview/lldrawpooltree.cpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/indra/newview/lldrawpooltree.cpp b/indra/newview/lldrawpooltree.cpp index 1a5832039..bb2fb09eb 100644 --- a/indra/newview/lldrawpooltree.cpp +++ b/indra/newview/lldrawpooltree.cpp @@ -110,9 +110,7 @@ void LLDrawPoolTree::render(S32 pass) renderTree(); } else - { - gGL.getTexUnit(sDiffTex)->bind(mTexturep); - } + gGL.getTexUnit(sDiffTex)->bind(mTexturep); for (std::vector::iterator iter = mDrawFace.begin(); iter != mDrawFace.end(); iter++) @@ -189,8 +187,8 @@ void LLDrawPoolTree::beginShadowPass(S32 pass) { LLFastTimer t(FTM_SHADOW_TREE); - static const LLCachedControl render_deferred_offset(gSavedSettings, "RenderDeferredTreeShadowOffset"); - static const LLCachedControl render_deferred_bias(gSavedSettings, "RenderDeferredTreeShadowBias"); + static const LLCachedControl render_deferred_offset("RenderDeferredTreeShadowOffset",1.f); + static const LLCachedControl render_deferred_bias("RenderDeferredTreeShadowBias",1.f); glPolygonOffset(render_deferred_offset,render_deferred_bias); gDeferredTreeShadowProgram.bind(); gDeferredTreeShadowProgram.setMinimumAlpha(0.5f); @@ -205,8 +203,8 @@ void LLDrawPoolTree::endShadowPass(S32 pass) { LLFastTimer t(FTM_SHADOW_TREE); - static const LLCachedControl render_deferred_offset(gSavedSettings, "RenderDeferredSpotShadowOffset"); - static const LLCachedControl render_deferred_bias(gSavedSettings, "RenderDeferredSpotShadowBias"); + static const LLCachedControl render_deferred_offset("RenderDeferredSpotShadowOffset",1.f); + static const LLCachedControl render_deferred_bias("RenderDeferredSpotShadowBias",1.f); glPolygonOffset(render_deferred_offset,render_deferred_bias); gDeferredTreeShadowProgram.unbind(); }