[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48330] branches/soc-2012-swiss_cheese/ source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVBO.cpp: Made use of ClientActiveTextureARB and ClientActiveTexture consistent.

Jason Wilkins Jason.A.Wilkins at gmail.com
Wed Jun 27 08:02:26 CEST 2012


Revision: 48330
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48330
Author:   jwilkins
Date:     2012-06-27 06:02:25 +0000 (Wed, 27 Jun 2012)
Log Message:
-----------
Made use of ClientActiveTextureARB and ClientActiveTexture consistent.  (both are deprecated but should be using one or the other if it is being used)

Modified Paths:
--------------
    branches/soc-2012-swiss_cheese/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVBO.cpp

Modified: branches/soc-2012-swiss_cheese/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVBO.cpp
===================================================================
--- branches/soc-2012-swiss_cheese/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVBO.cpp	2012-06-27 05:59:41 UTC (rev 48329)
+++ branches/soc-2012-swiss_cheese/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVBO.cpp	2012-06-27 06:02:25 UTC (rev 48330)
@@ -160,11 +160,11 @@
 					break;
 			}
 		}
-		glClientActiveTextureARB(GL_TEXTURE0_ARB);
+		glClientActiveTexture(GL_TEXTURE0_ARB);
 	}
 	else //TexFace
 	{
-		glClientActiveTextureARB(GL_TEXTURE0_ARB);
+		glClientActiveTexture(GL_TEXTURE0_ARB);
 		glEnableClientState(GL_TEXTURE_COORD_ARRAY);
 		glTexCoordPointer(2, GL_FLOAT, this->stride, this->uv_offset);
 	}




More information about the Bf-blender-cvs mailing list