[artoolkit-commits] artoolkit/lib/SRC/Gl gsub_lite.c,1.10,1.11

[Philip L. <phi...@us...>]

Update of /cvsroot/artoolkit/artoolkit/lib/SRC/Gl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18252/lib/SRC/Gl

Modified Files:
	gsub_lite.c 
Log Message:
Fix bug where re-enable of lighting and depth testing were swapped.

Index: gsub_lite.c
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/Gl/gsub_lite.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** gsub_lite.c	22 Sep 2005 00:48:47 -0000	1.10
--- gsub_lite.c	22 Sep 2005 19:44:36 -0000	1.11
***************
*** 758,765 ****
  	// Prepare an orthographic projection, set camera position for 2D drawing, and save GL state.
  	glGetTexEnviv(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, &texEnvModeSave); // Save GL texture environment mode.
- 	glGetBooleanv(GL_LIGHTING, &lightingSave);			// Save enabled state of lighting.
- 	glGetBooleanv(GL_DEPTH_TEST, &depthTestSave);		// Save enabled state of depth test.
  	glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
  	if (lightingSave == GL_TRUE) glDisable(GL_LIGHTING);
  	if (depthTestSave == GL_TRUE) glDisable(GL_DEPTH_TEST);
  	glMatrixMode(GL_PROJECTION);
--- 758,765 ----
  	// Prepare an orthographic projection, set camera position for 2D drawing, and save GL state.
  	glGetTexEnviv(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, &texEnvModeSave); // Save GL texture environment mode.
  	glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
+ 	lightingSave = glIsEnabled(GL_LIGHTING);			// Save enabled state of lighting.
  	if (lightingSave == GL_TRUE) glDisable(GL_LIGHTING);
+ 	depthTestSave = glIsEnabled(GL_DEPTH_TEST);		// Save enabled state of depth test.
  	if (depthTestSave == GL_TRUE) glDisable(GL_DEPTH_TEST);
  	glMatrixMode(GL_PROJECTION);
***************
*** 778,783 ****
  	glMatrixMode(GL_MODELVIEW);
  	glPopMatrix();
! 	if (lightingSave == GL_TRUE) glEnable(GL_DEPTH_TEST);			// Restore enabled state of depth test.
! 	if (depthTestSave == GL_TRUE) glEnable(GL_LIGHTING);			// Restore enabled state of lighting.
  	glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, texEnvModeSave); // Restore GL texture environment mode.
  	
--- 778,783 ----
  	glMatrixMode(GL_MODELVIEW);
  	glPopMatrix();
! 	if (depthTestSave == GL_TRUE) glEnable(GL_DEPTH_TEST);			// Restore enabled state of depth test.
! 	if (lightingSave == GL_TRUE) glEnable(GL_LIGHTING);			// Restore enabled state of lighting.
  	glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, texEnvModeSave); // Restore GL texture environment mode.