|
From: Tupone A. <at...@us...> - 2007-02-25 21:01:42
|
Update of /cvsroot/bzflag/bzflag/src/ogl In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv31851 Modified Files: Tag: v2_0_cs_branch OpenGLTexture.cxx Log Message: Texture conflict with CS Index: OpenGLTexture.cxx =================================================================== RCS file: /cvsroot/bzflag/bzflag/src/ogl/OpenGLTexture.cxx,v retrieving revision 2.10.2.4 retrieving revision 2.10.2.4.2.1 diff -w -u -r2.10.2.4 -r2.10.2.4.2.1 --- OpenGLTexture.cxx 6 Dec 2006 05:43:47 -0000 2.10.2.4 +++ OpenGLTexture.cxx 25 Feb 2007 21:01:41 -0000 2.10.2.4.2.1 @@ -135,6 +135,7 @@ void OpenGLTexture::initContext() { + return; // make texture map object/list glGenTextures(1, &list); |