diff --git a/indra/newview/lldrawpooltree.cpp b/indra/newview/lldrawpooltree.cpp index bb2fb09eb..1a5832039 100644 --- a/indra/newview/lldrawpooltree.cpp +++ b/indra/newview/lldrawpooltree.cpp @@ -110,7 +110,9 @@ 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++) @@ -187,8 +189,8 @@ void LLDrawPoolTree::beginShadowPass(S32 pass) { LLFastTimer t(FTM_SHADOW_TREE); - static const LLCachedControl render_deferred_offset("RenderDeferredTreeShadowOffset",1.f); - static const LLCachedControl render_deferred_bias("RenderDeferredTreeShadowBias",1.f); + static const LLCachedControl render_deferred_offset(gSavedSettings, "RenderDeferredTreeShadowOffset"); + static const LLCachedControl render_deferred_bias(gSavedSettings, "RenderDeferredTreeShadowBias"); glPolygonOffset(render_deferred_offset,render_deferred_bias); gDeferredTreeShadowProgram.bind(); gDeferredTreeShadowProgram.setMinimumAlpha(0.5f); @@ -203,8 +205,8 @@ void LLDrawPoolTree::endShadowPass(S32 pass) { LLFastTimer t(FTM_SHADOW_TREE); - static const LLCachedControl render_deferred_offset("RenderDeferredSpotShadowOffset",1.f); - static const LLCachedControl render_deferred_bias("RenderDeferredSpotShadowBias",1.f); + static const LLCachedControl render_deferred_offset(gSavedSettings, "RenderDeferredSpotShadowOffset"); + static const LLCachedControl render_deferred_bias(gSavedSettings, "RenderDeferredSpotShadowBias"); glPolygonOffset(render_deferred_offset,render_deferred_bias); gDeferredTreeShadowProgram.unbind(); }