diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2009-12-16 14:56:18 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2009-12-16 14:56:18 +0200 |
| commit | 734f37816ef35089bc0f5710dc1f9684bc5b9b69 (patch) | |
| tree | 38bcf9ca3bce50b9d0fba8b717b910bcbba638d7 /indra/newview/pipeline.cpp | |
| parent | e398f41074f40c0779d7cc29a8127540ac78b1f9 (diff) | |
| parent | 88291b378eda6178ae3f2cbda60feddf0e68e3fa (diff) | |
Merge from default branch.
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/pipeline.cpp')
| -rw-r--r-- | indra/newview/pipeline.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 282eddf380..73b5222ee3 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -7268,13 +7268,7 @@ void LLPipeline::generateWaterReflection(LLCamera& camera_in) updateCull(camera, ref_result, 1); stateSort(camera, ref_result); } - else - { - gGL.setColorMask(true, true); - mWaterRef.clear(); - gGL.setColorMask(true, false); - } - + ref_mask = mRenderTypeMask; mRenderTypeMask = mask; } |