diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-04-20 19:06:54 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-04-20 19:06:54 +0400 |
| commit | 6ef9f021bc00872c20b778dff775cdba2af96f27 (patch) | |
| tree | 93ebae93b0fdc9c13209190b16866e97aeff9ce6 /source/blender/makesrna/intern/rna_image_api.c | |
| parent | f62774505320a9e68001b9d3c1f655e354268473 (diff) | |
fix [#31036] image.gl_load() consistently segfault at gluBuild2DMipmaps
incorrect argument to gluBuild2DMipmaps()
Diffstat (limited to 'source/blender/makesrna/intern/rna_image_api.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_image_api.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_image_api.c b/source/blender/makesrna/intern/rna_image_api.c index 1b50db36a3d..8594bda96d1 100644 --- a/source/blender/makesrna/intern/rna_image_api.c +++ b/source/blender/makesrna/intern/rna_image_api.c @@ -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); |