archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix T61368: Brush texture preview ignores rotation

Browse Source
This commit is contained in:
Campbell Barton
2019-03-19 13:07:48 +11:00
parent d47f827019
commit d731ee4960
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/windowmanager/intern/wm_operators.c
View File

@@ -2062,11 +2062,6 @@ static void radial_control_paint_tex(RadialControl *rc, float radius, float alph
GLint swizzleMask[] = {GL_ZERO, GL_ZERO, GL_ZERO, GL_RED};
glTexParameteriv(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_RGBA, swizzleMask);
immBindBuiltinProgram(GPU_SHADER_2D_IMAGE_MASK_UNIFORM_COLOR);
immUniformColor3fvAlpha(col, alpha);
immUniform1i("image", 0);
/* set up rotation if available */
if (rc->rot_prop) {
rot = RNA_property_float_get(&rc->rot_ptr, rc->rot_prop);
@@ -2074,6 +2069,11 @@ static void radial_control_paint_tex(RadialControl *rc, float radius, float alph
GPU_matrix_rotate_2d(RAD2DEGF(rot));
}
immBindBuiltinProgram(GPU_SHADER_2D_IMAGE_MASK_UNIFORM_COLOR);
immUniformColor3fvAlpha(col, alpha);
immUniform1i("image", 0);
/* draw textured quad */
immBegin(GPU_PRIM_TRI_FAN, 4);