[iortcw] 55/152: All: Rend2: Fix specularScale override not being used in RB_IterateStagesGeneric

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to annotated tag 1.5a
in repository iortcw.

commit a03f045c14228104bf5d1bcac310e2cbfbf6e30e
Author: MAN-AT-ARMS <M4N4T4RMS at gmail.com>
Date:   Mon May 9 17:02:32 2016 -0400

    All: Rend2: Fix specularScale override not being used in RB_IterateStagesGeneric
---
 MP/code/rend2/tr_shade.c | 2 +-
 SP/code/rend2/tr_shade.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/MP/code/rend2/tr_shade.c b/MP/code/rend2/tr_shade.c
index 161877b..c029882 100644
--- a/MP/code/rend2/tr_shade.c
+++ b/MP/code/rend2/tr_shade.c
@@ -1566,7 +1566,7 @@ static void RB_IterateStagesGeneric( shaderCommands_t *input )
 					specularScale[1] = 0.0f;
 			}
 
-			GLSL_SetUniformVec4(sp, UNIFORM_SPECULARSCALE, pStage->specularScale);
+			GLSL_SetUniformVec4(sp, UNIFORM_SPECULARSCALE, specularScale);
 		}
 
 		//GLSL_SetUniformFloat(sp, UNIFORM_MAPLIGHTSCALE, backEnd.refdef.mapLightScale);
diff --git a/SP/code/rend2/tr_shade.c b/SP/code/rend2/tr_shade.c
index b8f320b..e099f04 100644
--- a/SP/code/rend2/tr_shade.c
+++ b/SP/code/rend2/tr_shade.c
@@ -1560,7 +1560,7 @@ static void RB_IterateStagesGeneric( shaderCommands_t *input )
 					specularScale[1] = 0.0f;
 			}
 
-			GLSL_SetUniformVec4(sp, UNIFORM_SPECULARSCALE, pStage->specularScale);
+			GLSL_SetUniformVec4(sp, UNIFORM_SPECULARSCALE, specularScale);
 		}
 
 		//GLSL_SetUniformFloat(sp, UNIFORM_MAPLIGHTSCALE, backEnd.refdef.mapLightScale);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git