diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-04-04 19:49:24 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-04-04 19:49:24 +0000 |
| commit | 98740db8fd5875033d08b6aef6d9bf5c3c49eeee (patch) | |
| tree | dd0e83734e50ffd4d9f87eb2ed4091f867f2f1fd /indra/newview/pipeline.cpp | |
| parent | aa96d1fddff3d5bf68a5014229a0d20584937222 (diff) | |
svn merge -r 59826:59968 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
Diffstat (limited to 'indra/newview/pipeline.cpp')
| -rw-r--r-- | indra/newview/pipeline.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 52ceb481d9..44ebb2503b 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -1916,11 +1916,13 @@ void LLPipeline::renderGeom(LLCamera& camera) // // stop_glerror(); - BOOL did_hud_elements = FALSE; + BOOL did_hud_elements = LLDrawPoolWater::sSkipScreenCopy; BOOL occlude = sUseOcclusion; U32 cur_type = 0; + glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_FALSE); + if (gPipeline.hasRenderDebugMask(LLPipeline::RENDER_DEBUG_PICKING)) { gObjectList.renderObjectsForSelect(camera); @@ -1928,7 +1930,6 @@ void LLPipeline::renderGeom(LLCamera& camera) else { LLFastTimer t(LLFastTimer::FTM_POOLS); - glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_FALSE); calcNearbyLights(camera); pool_set_t::iterator iter1 = mPools.begin(); while ( iter1 != mPools.end() ) @@ -2002,7 +2003,6 @@ void LLPipeline::renderGeom(LLCamera& camera) iter1 = iter2; stop_glerror(); } - glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); } #ifndef LL_RELEASE_FOR_DOWNLOAD @@ -2039,6 +2039,8 @@ void LLPipeline::renderGeom(LLCamera& camera) // have touch-handlers. mHighlightFaces.clear(); + glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); + if (!hasRenderType(LLPipeline::RENDER_TYPE_HUD) && !LLDrawPoolWater::sSkipScreenCopy && sRenderGlow && |