This is an automated email from the git hooks/post-receive script. smcv pushed a commit to annotated tag 1.42d in repository iortcw.
commit 3a8b3df3027c2c3f65add66e8b85fc7ab1734ac8 Author: [email protected] <[email protected]@e65d2741-a53d-b2dc-ae96-bb75fa5e4c4a> Date: Wed Mar 5 02:10:29 2014 +0000 All: Rend2: Set default normal/specular in RE_RegisterShaderFromImage --- MP/code/rend2/tr_shader.c | 7 +++++++ SP/code/rend2/tr_shader.c | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/MP/code/rend2/tr_shader.c b/MP/code/rend2/tr_shader.c index ae779aa..95f5581 100644 --- a/MP/code/rend2/tr_shader.c +++ b/MP/code/rend2/tr_shader.c @@ -3505,6 +3505,13 @@ qhandle_t RE_RegisterShaderFromImage( const char *name, int lightmapIndex, image shader.lightmapIndex = lightmapIndex; for ( i = 0 ; i < MAX_SHADER_STAGES ; i++ ) { stages[i].bundle[0].texMods = texMods[i]; + + // default normal/specular + VectorSet4(stages[i].normalScale, 0.0f, 0.0f, 0.0f, 0.0f); + stages[i].specularScale[0] = + stages[i].specularScale[1] = + stages[i].specularScale[2] = r_baseSpecular->value; + stages[i].specularScale[3] = r_baseGloss->value; } // diff --git a/SP/code/rend2/tr_shader.c b/SP/code/rend2/tr_shader.c index 3ab5b01..1e12c2c 100644 --- a/SP/code/rend2/tr_shader.c +++ b/SP/code/rend2/tr_shader.c @@ -3556,6 +3556,13 @@ qhandle_t RE_RegisterShaderFromImage( const char *name, int lightmapIndex, image shader.lightmapIndex = lightmapIndex; for ( i = 0 ; i < MAX_SHADER_STAGES ; i++ ) { stages[i].bundle[0].texMods = texMods[i]; + + // default normal/specular + VectorSet4(stages[i].normalScale, 0.0f, 0.0f, 0.0f, 0.0f); + stages[i].specularScale[0] = + stages[i].specularScale[1] = + stages[i].specularScale[2] = r_baseSpecular->value; + stages[i].specularScale[3] = r_baseGloss->value; } // -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
