diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-08-08 15:30:34 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-08-08 15:30:34 -0500 |
| commit | b9439ac006ac64179180ec2a47f6bd92468de455 (patch) | |
| tree | 0d3da395c91ddadda4ad23b4d331ec001b6a4f84 /indra/newview/lldrawpooltree.cpp | |
| parent | 5e22062b68d2392d465503b3954cf06001eda608 (diff) | |
| parent | 14f6bbadef2c39e58a3b54c0c6212949acf50e45 (diff) | |
merge
Diffstat (limited to 'indra/newview/lldrawpooltree.cpp')
| -rw-r--r-- | indra/newview/lldrawpooltree.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/lldrawpooltree.cpp b/indra/newview/lldrawpooltree.cpp index a6e0151114..50a52ac4cf 100644 --- a/indra/newview/lldrawpooltree.cpp +++ b/indra/newview/lldrawpooltree.cpp @@ -65,17 +65,18 @@ void LLDrawPoolTree::beginRenderPass(S32 pass) if (LLPipeline::sUnderWaterRender) { - shader = &gObjectAlphaMaskNonIndexedWaterProgram; + shader = &gTreeWaterProgram; } else { - shader = &gObjectAlphaMaskNonIndexedProgram; + shader = &gTreeProgram; } if (gPipeline.canUseVertexShaders()) { shader->bind(); shader->setAlphaRange(0.5f, 1.f); + gGL.diffuseColor4f(1,1,1,1); } else { |