SH-2242 Physics shape display works again, added asserts to flush out areas where state being consumed by a shader does not match state being provided by vertex buffers.

1 files changed, 1 insertions, 2 deletions

diff --git a/indra/newview/lldrawpoolalpha.cpp b/indra/newview/lldrawpoolalpha.cpp
index a3f8eb377a..1e04cd9c17 100644
--- a/indra/newview/lldrawpoolalpha.cpp
+++ b/indra/newview/lldrawpoolalpha.cpp
@@ -322,13 +322,12 @@ void LLDrawPoolAlpha::render(S32 pass)
 		if(shaders) 
 		{
 			gHighlightProgram.bind();
-			gHighlightProgram.uniform4f("highlight_color", 1,0,0,1);
 		}
 		else
 		{
 			gPipeline.enableLightsFullbright(LLColor4(1,1,1,1));
-			gGL.diffuseColor4f(1,0,0,1);
 		}
+		gGL.diffuseColor4f(1,0,0,1);
 		
 		LLViewerFetchedTexture::sSmokeImagep->addTextureStats(1024.f*1024.f);
 		gGL.getTexUnit(0)->bind(LLViewerFetchedTexture::sSmokeImagep, TRUE) ;