diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-05-12 03:59:01 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-05-12 03:59:01 -0500 |
| commit | 9950c22a5568b55ff896734185e0e1181a93fcf0 (patch) | |
| tree | a8ab6b0e7f3dd751962d7b36c351924f7e802de3 /indra/newview/llviewerdisplay.cpp | |
| parent | 45aa68fde1fd8c89fa5e7766e1f50b14a577638f (diff) | |
Fix for fullbright bump not working in deferred render.
Fix for shadow artifacts around split frusta.
Tweak for shadow aliasing with projectors.
Fix for crash on exit in mesh thread.
Diffstat (limited to 'indra/newview/llviewerdisplay.cpp')
| -rw-r--r-- | indra/newview/llviewerdisplay.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp index 360cee9f73..3cd7af6433 100644 --- a/indra/newview/llviewerdisplay.cpp +++ b/indra/newview/llviewerdisplay.cpp @@ -946,9 +946,10 @@ void render_hud_attachments() bool render_particles = gPipeline.hasRenderType(LLPipeline::RENDER_TYPE_PARTICLES) && gSavedSettings.getBOOL("RenderHUDParticles"); //only render hud objects - U32 mask = gPipeline.getRenderTypeMask(); + gPipeline.pushRenderTypeMask(); + // turn off everything - gPipeline.setRenderTypeMask(0); + gPipeline.andRenderTypeMask(LLPipeline::END_RENDER_TYPES); // turn on HUD gPipeline.toggleRenderType(LLPipeline::RENDER_TYPE_HUD); // turn on HUD particles @@ -1002,7 +1003,8 @@ void render_hud_attachments() render_hud_elements(); //restore type mask - gPipeline.setRenderTypeMask(mask); + gPipeline.popRenderTypeMask(); + if (has_ui) { gPipeline.toggleRenderDebugFeature((void*) LLPipeline::RENDER_DEBUG_FEATURE_UI); |