[Bf-blender-cvs] [431a5b6] master: Fix T47688: Regression in gl_load

Campbell Barton noreply at git.blender.org
Mon Mar 7 04:40:27 CET 2016


Commit: 431a5b623e2c7309517bdcaf3e665c08a6c3e2d0
Author: Campbell Barton
Date:   Mon Mar 7 14:31:45 2016 +1100
Branches: master
https://developer.blender.org/rB431a5b623e2c7309517bdcaf3e665c08a6c3e2d0

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);




More information about the Bf-blender-cvs mailing list