diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-11-10 11:39:08 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-11-10 11:39:08 -0600 |
| commit | c8f558f6775d62f03d6caab19668df80e95e8a8b (patch) | |
| tree | b74dd0d7e34bf670ebf59b2f37c6c7509f599d87 /indra/newview/pipeline.cpp | |
| parent | aa8f3d30704ea43a8fc2f9262a57968277c4db20 (diff) | |
SH-2240 Better fix for red moon -- stop special casing "highlight_color" as a parameter.
Diffstat (limited to 'indra/newview/pipeline.cpp')
| -rw-r--r-- | indra/newview/pipeline.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 49f83fdb0d..3f91c3cddc 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -3583,7 +3583,7 @@ void LLPipeline::renderHighlights() if ((LLViewerShaderMgr::instance()->getVertexShaderLevel(LLViewerShaderMgr::SHADER_INTERFACE) > 0)) { gHighlightProgram.bind(); - gHighlightProgram.uniform4f(LLShaderMgr::HIGHLIGHT_COLOR,1,1,1,0.5f); + gGL.diffuseColor4f(1,1,1,0.5f); } if (hasRenderDebugFeatureMask(RENDER_DEBUG_FEATURE_SELECTED)) @@ -3613,10 +3613,7 @@ void LLPipeline::renderHighlights() { // Paint 'em red! color.setVec(1.f, 0.f, 0.f, 0.5f); - if ((LLViewerShaderMgr::instance()->getVertexShaderLevel(LLViewerShaderMgr::SHADER_INTERFACE) > 0)) - { - gHighlightProgram.uniform4f(LLShaderMgr::HIGHLIGHT_COLOR,1,0,0,0.5f); - } + int count = mHighlightFaces.size(); for (S32 i = 0; i < count; i++) { |