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 ffe2f588bbb6b5926e057402ca7e0910745da856
Author: Zack Middleton <zturtle...@gmail.com>
Date: Fri Oct 16 06:59:19 2015 -0500
Rend2: Fix textures being white in Garand scope view
Make lightmaps white not texture diffuse.
---
MP/code/rend2/tr_shade.c | 4 ++--
SP/code/rend2/tr_shade.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/MP/code/rend2/tr_shade.c b/MP/code/rend2/tr_shade.c
index c9bc81c..6aeb285 100644
--- a/MP/code/rend2/tr_shade.c
+++ b/MP/code/rend2/tr_shade.c
@@ -117,7 +117,7 @@ static void R_BindAnimatedImageToTMU( textureBundle_t
*bundle, int tmu ) {
if ( bundle->numImageAnimations <= 1 ) {
if ( bundle->isLightmap && ( backEnd.refdef.rdflags &
RDF_SNOOPERVIEW ) ) {
- GL_BindToTMU( tr.whiteImage, 0 );
+ GL_BindToTMU( tr.whiteImage, tmu );
} else {
GL_BindToTMU( bundle->image[0], tmu);
}
@@ -135,7 +135,7 @@ static void R_BindAnimatedImageToTMU( textureBundle_t
*bundle, int tmu ) {
index %= bundle->numImageAnimations;
if ( bundle->isLightmap && ( backEnd.refdef.rdflags & RDF_SNOOPERVIEW )
) {
- GL_BindToTMU( tr.whiteImage, 0 );
+ GL_BindToTMU( tr.whiteImage, tmu );
} else {
GL_BindToTMU( bundle->image[ index ], tmu );
}
diff --git a/SP/code/rend2/tr_shade.c b/SP/code/rend2/tr_shade.c
index ed8a489..21b8c07 100644
--- a/SP/code/rend2/tr_shade.c
+++ b/SP/code/rend2/tr_shade.c
@@ -110,7 +110,7 @@ static void R_BindAnimatedImageToTMU( textureBundle_t
*bundle, int tmu ) {
if ( bundle->numImageAnimations <= 1 ) {
if ( bundle->isLightmap && ( backEnd.refdef.rdflags &
RDF_SNOOPERVIEW ) ) {
- GL_BindToTMU( tr.whiteImage, 0 );
+ GL_BindToTMU( tr.whiteImage, tmu );
} else {
GL_BindToTMU( bundle->image[0], tmu);
}
@@ -128,7 +128,7 @@ static void R_BindAnimatedImageToTMU( textureBundle_t
*bundle, int tmu ) {
index %= bundle->numImageAnimations;
if ( bundle->isLightmap && ( backEnd.refdef.rdflags & RDF_SNOOPERVIEW )
) {
- GL_BindToTMU( tr.whiteImage, 0 );
+ GL_BindToTMU( tr.whiteImage, tmu );
} else {
GL_BindToTMU( bundle->image[ index ], tmu );
}
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/iortcw.git
_______________________________________________
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
