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 4e059f742771ec7bf6de435b58b74bdb87bc8853
Author: m4n4t4...@gmail.com 
<m4n4t4...@gmail.com@e65d2741-a53d-b2dc-ae96-bb75fa5e4c4a>
Date:   Wed Oct 15 20:52:17 2014 +0000

    All: Rend2: Fix invalid texture parameter
---
 MP/code/rend2/tr_image.c | 4 ++--
 SP/code/rend2/tr_image.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/MP/code/rend2/tr_image.c b/MP/code/rend2/tr_image.c
index bb7a18a..539266b 100644
--- a/MP/code/rend2/tr_image.c
+++ b/MP/code/rend2/tr_image.c
@@ -2295,14 +2295,14 @@ image_t *R_CreateImage( const char *name, byte *pic, 
int width, int height, imgT
                qglTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_WRAP_T, 
GL_CLAMP_TO_EDGE);
                qglTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_WRAP_R, 
GL_CLAMP_TO_EDGE);
 
+               qglTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_MAG_FILTER, 
GL_LINEAR);
+
                if (image->flags & IMGFLAG_MIPMAP)
                {
-                       qglTexParameteri(GL_TEXTURE_CUBE_MAP, 
GL_TEXTURE_MAG_FILTER, GL_LINEAR_MIPMAP_LINEAR);
                        qglTexParameteri(GL_TEXTURE_CUBE_MAP, 
GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
                }
                else
                {
-                       qglTexParameteri(GL_TEXTURE_CUBE_MAP, 
GL_TEXTURE_MAG_FILTER, GL_LINEAR);
                        qglTexParameteri(GL_TEXTURE_CUBE_MAP, 
GL_TEXTURE_MIN_FILTER, GL_LINEAR);
                }
 
diff --git a/SP/code/rend2/tr_image.c b/SP/code/rend2/tr_image.c
index 592ee40..ac82eec 100644
--- a/SP/code/rend2/tr_image.c
+++ b/SP/code/rend2/tr_image.c
@@ -2293,14 +2293,14 @@ image_t *R_CreateImageExt( const char *name, byte *pic, 
int width, int height, i
                qglTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_WRAP_T, 
GL_CLAMP_TO_EDGE);
                qglTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_WRAP_R, 
GL_CLAMP_TO_EDGE);
 
+               qglTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_MAG_FILTER, 
GL_LINEAR);
+
                if (image->flags & IMGFLAG_MIPMAP)
                {
-                       qglTexParameteri(GL_TEXTURE_CUBE_MAP, 
GL_TEXTURE_MAG_FILTER, GL_LINEAR_MIPMAP_LINEAR);
                        qglTexParameteri(GL_TEXTURE_CUBE_MAP, 
GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
                }
                else
                {
-                       qglTexParameteri(GL_TEXTURE_CUBE_MAP, 
GL_TEXTURE_MAG_FILTER, GL_LINEAR);
                        qglTexParameteri(GL_TEXTURE_CUBE_MAP, 
GL_TEXTURE_MIN_FILTER, GL_LINEAR);
                }
 

-- 
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

Reply via email to