[Bf-blender-cvs] [af57843] master: Correct recent OpenGL cleanup

Campbell Barton noreply at git.blender.org
Tue Dec 8 12:59:51 CET 2015


Commit: af5784312a1bb8079d2e1edffdb6d8f607029f9e
Author: Campbell Barton
Date:   Tue Dec 8 22:52:51 2015 +1100
Branches: master
https://developer.blender.org/rBaf5784312a1bb8079d2e1edffdb6d8f607029f9e

Correct recent OpenGL cleanup

===================================================================

M	source/blender/editors/sculpt_paint/paint_cursor.c

===================================================================

diff --git a/source/blender/editors/sculpt_paint/paint_cursor.c b/source/blender/editors/sculpt_paint/paint_cursor.c
index a531a29..f57255a 100644
--- a/source/blender/editors/sculpt_paint/paint_cursor.c
+++ b/source/blender/editors/sculpt_paint/paint_cursor.c
@@ -326,7 +326,7 @@ static int load_tex(Brush *br, ViewContext *vc, float zoom, bool col, bool prima
 		GLenum internalformat = col ? GL_RGBA8 : GL_ALPHA8;
 
 		if (!init || (target->old_col != col)) {
-			glTexImage2D(GL_TEXTURE_2D, 0, format, size, size, 0, format, GL_UNSIGNED_BYTE, buffer);
+			glTexImage2D(GL_TEXTURE_2D, 0, internalformat, size, size, 0, format, GL_UNSIGNED_BYTE, buffer);
 		}
 		else {
 			glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, size, size, format, GL_UNSIGNED_BYTE, buffer);




More information about the Bf-blender-cvs mailing list