Commit: 1e2c8ca6ead5ad5ddca3af95ee28332e426c88cd
Author: Campbell Barton
Date: Mon Mar 7 14:31:45 2016 +1100
Branches: blender-v2.77-release
https://developer.blender.org/rB1e2c8ca6ead5ad5ddca3af95ee28332e426c88cd
Fix T47688: Regression in gl_load
Error caused by 771f73b6
===================================================================
M source/blender/makesrna/intern/rna_image_api.c
===================================================================
diff --git a/source/blender/makesrna/intern/rna_image_api.c
b/source/blender/makesrna/intern/rna_image_api.c
index eb8dd5a..6530e09 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);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
