From ac2137c3b6c402e7cb728b150a4a8f27cdcb1820 Mon Sep 17 00:00:00 2001 From: Andrzej Kapolka Date: Fri, 23 May 2014 16:56:10 -0700 Subject: [PATCH] Fixed a couple copy and paste errors. --- interface/src/renderer/Model.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/interface/src/renderer/Model.cpp b/interface/src/renderer/Model.cpp index d1a0a3ec7c..11e2a59127 100644 --- a/interface/src/renderer/Model.cpp +++ b/interface/src/renderer/Model.cpp @@ -350,7 +350,7 @@ void Model::init() { Application::resourcesPath() + "shaders/model_shadow_normal_specular_map.frag"); _skinShadowNormalSpecularMapProgram.link(); - initSkinProgram(_skinNormalSpecularMapProgram, _skinShadowNormalSpecularMapLocations, 2, 3); + initSkinProgram(_skinShadowNormalSpecularMapProgram, _skinShadowNormalSpecularMapLocations, 2, 3); _skinShadowProgram.addShaderFromSourceFile(QGLShader::Vertex, @@ -1646,6 +1646,7 @@ void Model::renderMeshes(float alpha, RenderMode mode, bool translucent) { program = &_shadowNormalMapProgram; skinProgram = &_skinShadowNormalMapProgram; skinLocations = &_skinShadowNormalMapLocations; + shadowTextureUnit = GL_TEXTURE2; } else { program = &_normalMapProgram; skinProgram = &_skinNormalMapProgram; @@ -1656,14 +1657,14 @@ void Model::renderMeshes(float alpha, RenderMode mode, bool translucent) { program = &_shadowSpecularMapProgram; skinProgram = &_skinShadowSpecularMapProgram; skinLocations = &_skinShadowSpecularMapLocations; - specularTextureUnit = GL_TEXTURE1; shadowTextureUnit = GL_TEXTURE2; } else { program = &_specularMapProgram; skinProgram = &_skinSpecularMapProgram; skinLocations = &_skinSpecularMapLocations; - specularTextureUnit = GL_TEXTURE1; } + specularTextureUnit = GL_TEXTURE1; + } else if (receiveShadows) { program = &_shadowMapProgram; skinProgram = &_skinShadowMapProgram;