diff options
| author | callum <none@none> | 2009-12-16 14:34:13 -0800 |
|---|---|---|
| committer | callum <none@none> | 2009-12-16 14:34:13 -0800 |
| commit | 17ea8bfa9ea69b1022d0f8754732c479fe5a7f6b (patch) | |
| tree | c2b18373bad5e9856cf3edf226783c8767230559 /indra/newview/pipeline.cpp | |
| parent | 828694987cce58b88143e3a2c5bd55a10e6afc24 (diff) | |
| parent | d3ca545687945054c666359e78ada94949732205 (diff) | |
Merge with tip
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; } |