Commit 81c39d28 authored by Graham Linden's avatar Graham Linden
Browse files

Fix spurious assert from using highlights without binding highlight shader.

Only affects devs, but could have downstream consequences for rendering.
parent 5e5c5ca0
......@@ -4139,7 +4139,12 @@ void LLPipeline::renderHighlights()
glStencilFunc(GL_ALWAYS, 0, 0xFFFFFFFF);
glStencilOp(GL_REPLACE, GL_REPLACE, GL_REPLACE);
if (canUseVertexShaders())
{
gHighlightProgram.bind();
}
gGL.setColorMask(false, false);
for (std::set<HighlightItem>::iterator iter = mHighlightSet.begin(); iter != mHighlightSet.end(); ++iter)
{
......@@ -10507,6 +10512,11 @@ void LLPipeline::generateHighlight(LLCamera& camera)
gGL.setColorMask(true, true);
mHighlight.clear();
if (canUseVertexShaders())
{
gHighlightProgram.bind();
}
gGL.getTexUnit(0)->bind(LLViewerFetchedTexture::sWhiteImagep);
for (std::set<HighlightItem>::iterator iter = mHighlightSet.begin(); iter != mHighlightSet.end(); )
{
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment