bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

fix [#31036] image.gl_load() consistently segfault at gluBuild2DMipmaps

Browse Source 
incorrect argument to gluBuild2DMipmaps()
This commit is contained in:
Campbell Barton 2012-04-20 15:06:54 +00:00
parent f627745053
commit 6ef9f021bc
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/makesrna/intern/rna_image_api.c
View File

@ -200,7 +200,7 @@ static int rna_Image_gl_load(Image *image, ReportList *reports, int filter, int
glBindTexture(GL_TEXTURE_2D, *bind);
if (filter != GL_NEAREST && filter != GL_LINEAR)
error = (int)gluBuild2DMipmaps(GL_TEXTURE_2D, GL_RGBA, ibuf->x, ibuf->y, GL_RGBA, GL_UNSIGNED_INT, ibuf->rect);
error = (int)gluBuild2DMipmaps(GL_TEXTURE_2D, GL_RGBA, ibuf->x, ibuf->y, GL_RGBA, GL_UNSIGNED_BYTE, ibuf->rect);
if (!error) {
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, image->tpageflag & IMA_CLAMP_U ? GL_CLAMP : GL_REPEAT);