[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30952] trunk/blender/source/blender/ makesrna/intern/rna_image_api.c: patch [#23144] bpy.Image.gl_load() -- fix

[Campbell Barton]

Revision: 30952
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30952
Author:   campbellbarton
Date:     2010-08-02 00:20:45 +0200 (Mon, 02 Aug 2010)

Log Message:
-----------
patch [#23144] bpy.Image.gl_load() -- fix
from Dan Eicher (dna)
- image.gl_load() was using GL_UNSIGNED_INT rather then GL_UNSIGNED_BYTE channel type.
- changed image.gl_load() to use the image clamp settings (patch had this as an extra argument).

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	2010-08-01 22:11:57 UTC (rev 30951)
+++ trunk/blender/source/blender/makesrna/intern/rna_image_api.c	2010-08-01 22:20:45 UTC (rev 30952)
@@ -153,10 +153,12 @@
 		error = (int)gluBuild2DMipmaps(GL_TEXTURE_2D, GL_RGBA, ibuf->x, ibuf->y, GL_RGBA, GL_UNSIGNED_INT, ibuf->rect);
 
 	if (!error) {
+		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, image->tpageflag & IMA_CLAMP_U ? GL_CLAMP : GL_REPEAT);
+		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, image->tpageflag & IMA_CLAMP_V ? GL_CLAMP : GL_REPEAT);
 		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, (GLint)filter);
 		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_INT, ibuf->rect); 
+		glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, ibuf->x, ibuf->y, 0, GL_RGBA, GL_UNSIGNED_BYTE, ibuf->rect); 
 		error = (int)glGetError();
 	}