diff options
| author | James Cook <james@lindenlab.com> | 2009-12-16 16:40:06 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-12-16 16:40:06 -0800 |
| commit | 3c06dc4df2d9ee11e7d346f902d34eaee17161a5 (patch) | |
| tree | 40c5342da322116d093268e0437736f860d62e0d /indra/newview/pipeline.cpp | |
| parent | 4c0d5200bc7a53537f9ee7028e74c1feb4abc52e (diff) | |
| parent | c08699f900bf1560f61ea05e44449e90bb02c708 (diff) | |
Merge
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; } |