Commit:     b5e643220e14c6f525b6e1eda597ce0d8d31e107

Trac URL:   
http://developer.wz2100.net/changeset/b5e643220e14c6f525b6e1eda597ce0d8d31e107

Author:     safety0ff <[email protected]>
Date:       Fri Oct 15 21:42:35 2010 -0400

Fix bug introduced in f83a8aa576c2e that made fixed pipeline tcmask render 
incorrectly.

 src/terrain.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/terrain.c b/src/terrain.c
index c71a7eb..e6c162c 100644
--- a/src/terrain.c
+++ b/src/terrain.c
@@ -1360,6 +1360,8 @@ void drawTerrain(void)
        // disable the lightmap texture
        glActiveTexture(GL_TEXTURE1);
        glDisable(GL_TEXTURE_2D);
+       glDisable(GL_TEXTURE_GEN_S);
+       glDisable(GL_TEXTURE_GEN_T);
        glMatrixMode(GL_TEXTURE);
        glLoadIdentity();
        glActiveTexture(GL_TEXTURE0);


-------------------------

Commit:     3a37a47cf9b236199ab0ed7c9a6c1ece96ca4fda

Trac URL:   
http://developer.wz2100.net/changeset/3a37a47cf9b236199ab0ed7c9a6c1ece96ca4fda

Author:     safety0ff <[email protected]>
Date:       Fri Oct 15 21:51:24 2010 -0400

Add changes that were intended to be included in f83a8aa576c2e.

 lib/ivis_opengl/piefunc.c  |    6 +++---
 lib/ivis_opengl/piestate.c |    4 ++--
 src/terrain.c              |    6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)


-------------------------


------------------------------------------------------------------------------
Download new Adobe(R) Flash(R) Builder(TM) 4
The new Adobe(R) Flex(R) 4 and Flash(R) Builder(TM) 4 (formerly 
Flex(R) Builder(TM)) enable the development of rich applications that run
across multiple browsers and platforms. Download your free trials today!
http://p.sf.net/sfu/adobe-dev2dev
_______________________________________________
Warzone2100-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

Reply via email to