NORSPEC-291 WIP materials underwater with haze, reflection broken, water dist broken

1 files changed, 6 insertions, 9 deletions

diff --git a/indra/newview/lldrawpoolavatar.cpp b/indra/newview/lldrawpoolavatar.cpp
index 45abb87bad..3815548dba 100755
--- a/indra/newview/lldrawpoolavatar.cpp
+++ b/indra/newview/lldrawpoolavatar.cpp
@@ -297,14 +297,12 @@ void LLDrawPoolAvatar::beginDeferredRiggedMaterialAlpha(S32 pass)
 
 	pass += LLMaterial::SHADER_COUNT;
 
+	sVertexProgram = &gDeferredMaterialProgram[pass];
+
 	if (LLPipeline::sUnderWaterRender)
 	{
 		sVertexProgram = &(gDeferredMaterialWaterProgram[pass]);
 	}
-	else
-	{
-		sVertexProgram = &(gDeferredMaterialProgram[pass]);
-	}
 
 	gPipeline.bindDeferredShader(*sVertexProgram);
 	sDiffuseChannel = sVertexProgram->enableTexture(LLViewerShaderMgr::DIFFUSE_MAP);
@@ -1099,14 +1097,13 @@ void LLDrawPoolAvatar::beginDeferredRiggedMaterial(S32 pass)
 	{ //skip alpha passes
 		return;
 	}
+	sVertexProgram = &gDeferredMaterialProgram[pass+LLMaterial::SHADER_COUNT];
+
 	if (LLPipeline::sUnderWaterRender)
 	{
-		sVertexProgram = &gDeferredMaterialWaterProgram[pass+LLMaterial::SHADER_COUNT];
-	}
-	else
-	{
-		sVertexProgram = &gDeferredMaterialProgram[pass+LLMaterial::SHADER_COUNT];
+		sVertexProgram = &(gDeferredMaterialWaterProgram[pass]);
 	}
+
 	sVertexProgram->bind();
 	normal_channel = sVertexProgram->enableTexture(LLViewerShaderMgr::BUMP_MAP);
 	specular_channel = sVertexProgram->enableTexture(LLViewerShaderMgr::SPECULAR_MAP);