[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47125] trunk/blender/source/blender/ makesrna/intern/rna_image_api.c: image.gl_load(): clear glGetError buffer before getting a new one

Dalai Felinto dfelinto at gmail.com
Mon May 28 19:03:13 CEST 2012


Revision: 47125
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47125
Author:   dfelinto
Date:     2012-05-28 17:03:13 +0000 (Mon, 28 May 2012)
Log Message:
-----------
image.gl_load(): clear glGetError buffer before getting a new one

Modified Paths:
--------------
    trunk/blender/source/blender/makesrna/intern/rna_image_api.c

Modified: trunk/blender/source/blender/makesrna/intern/rna_image_api.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_image_api.c	2012-05-28 16:58:12 UTC (rev 47124)
+++ trunk/blender/source/blender/makesrna/intern/rna_image_api.c	2012-05-28 17:03:13 UTC (rev 47125)
@@ -213,7 +213,9 @@
 		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, (GLint)mag);
 		glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
 		glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, ibuf->x, ibuf->y, 0, GL_RGBA, GL_UNSIGNED_BYTE, ibuf->rect);
-		error = (int)glGetError();
+
+		while (error != GL_NO_ERROR)
+			error = (int)glGetError();
 	}
 
 	if (error) {




More information about the Bf-blender-cvs mailing list