[Bf-blender-cvs] [907135011a0] blender2.8: Fix hardcoded attribute locations used in image draw
Sergey Sharybin
noreply at git.blender.org
Mon May 8 17:06:00 CEST 2017
Commit: 907135011a03620a25043deaf0fdd1742320ee0e
Author: Sergey Sharybin
Date: Mon May 8 16:31:10 2017 +0200
Branches: blender2.8
https://developer.blender.org/rB907135011a03620a25043deaf0fdd1742320ee0e
Fix hardcoded attribute locations used in image draw
===================================================================
M source/blender/editors/screen/glutil.c
===================================================================
diff --git a/source/blender/editors/screen/glutil.c b/source/blender/editors/screen/glutil.c
index b284800d510..2eb981467f2 100644
--- a/source/blender/editors/screen/glutil.c
+++ b/source/blender/editors/screen/glutil.c
@@ -242,7 +242,7 @@ void immDrawPixelsTexScaled_clipping(IMMDrawPixelsTexState *state,
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, tex_w, tex_h, 0, format, GL_UNSIGNED_BYTE, NULL);
}
- unsigned int pos = 0, texco = 1;
+ unsigned int pos = state->pos, texco = state->texco;
/* optional */
/* NOTE: Shader could be null for GLSL OCIO drawing, it is fine, since
More information about the Bf-blender-cvs
mailing list