From 8535f4d07326ee351d5b889109e1c3e881b4905c Mon Sep 17 00:00:00 2001 From: Philipp Oeser Date: Tue, 16 Apr 2019 13:36:44 +0200 Subject: Fix T63619: Fill Tool is misaligned when 'Gradient' is enabled Reviewers: brecht Maniphest Tasks: T63619 Differential Revision: https://developer.blender.org/D4692 --- source/blender/editors/sculpt_paint/paint_image.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'source/blender/editors/sculpt_paint/paint_image.c') diff --git a/source/blender/editors/sculpt_paint/paint_image.c b/source/blender/editors/sculpt_paint/paint_image.c index 0fdd3043d0c..91b37442301 100644 --- a/source/blender/editors/sculpt_paint/paint_image.c +++ b/source/blender/editors/sculpt_paint/paint_image.c @@ -418,6 +418,8 @@ static void gradient_draw_line(bContext *UNUSED(C), int x, int y, void *customda GPUVertFormat *format = immVertexFormat(); uint pos = GPU_vertformat_attr_add(format, "pos", GPU_COMP_I32, 2, GPU_FETCH_INT_TO_FLOAT); + ARegion *ar = pop->vc.ar; + immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR); GPU_line_width(4.0); @@ -425,7 +427,7 @@ static void gradient_draw_line(bContext *UNUSED(C), int x, int y, void *customda immBegin(GPU_PRIM_LINES, 2); immVertex2i(pos, x, y); - immVertex2i(pos, pop->startmouse[0], pop->startmouse[1]); + immVertex2i(pos, pop->startmouse[0] + ar->winrct.xmin, pop->startmouse[1] + ar->winrct.ymin); immEnd(); GPU_line_width(2.0); @@ -433,7 +435,7 @@ static void gradient_draw_line(bContext *UNUSED(C), int x, int y, void *customda immBegin(GPU_PRIM_LINES, 2); immVertex2i(pos, x, y); - immVertex2i(pos, pop->startmouse[0], pop->startmouse[1]); + immVertex2i(pos, pop->startmouse[0] + ar->winrct.xmin, pop->startmouse[1] + ar->winrct.ymin); immEnd(); immUnbindProgram(); -- cgit v1.2.3