diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2016-03-07 06:31:45 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-03-18 13:44:20 +0300 |
| commit | 1e2c8ca6ead5ad5ddca3af95ee28332e426c88cd (patch) | |
| tree | 4faac5013a60d3f2a26f5db127860808a5602a14 | |
| parent | 88a3b686103864c10c7e9dc7a7e1da7bb91a3b67 (diff) | |
Fix T47688: Regression in gl_load
Error caused by 771f73b6
| -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 eb8dd5a63d4..6530e0938f6 100644 --- a/source/blender/makesrna/intern/rna_image_api.c +++ b/source/blender/makesrna/intern/rna_image_api.c @@ -245,7 +245,7 @@ static int rna_Image_gl_load(Image *image, ReportList *reports, int frame, int f return (int)GL_INVALID_OPERATION; } - GPU_create_gl_tex(bind, ibuf->rect, ibuf->rect_float, GL_TEXTURE_2D, ibuf->x, ibuf->y, + GPU_create_gl_tex(bind, ibuf->rect, ibuf->rect_float, ibuf->x, ibuf->y, GL_TEXTURE_2D, (filter != GL_NEAREST && filter != GL_LINEAR), false, image); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, (GLint)filter); |