From 33bb8b785a938da64d55687d50f1a78cd6bbb733 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Mon, 30 Apr 2018 19:47:33 +0200 Subject: [PATCH] Fix T54900: radial control drawing in wrong place after recent WM changes. --- source/blender/windowmanager/intern/wm_operators.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index 67db38c13ed..e6c7f5e94cb 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -2619,10 +2619,9 @@ static void radial_control_paint_tex(RadialControl *rc, float radius, float alph immUnbindProgram(); } -static void radial_control_paint_cursor(bContext *C, int x, int y, void *customdata) +static void radial_control_paint_cursor(bContext *UNUSED(C), int x, int y, void *customdata) { RadialControl *rc = customdata; - ARegion *ar = CTX_wm_region(C); uiStyle *style = UI_style_get(); const uiFontStyle *fstyle = &style->widget; const int fontid = fstyle->uifont_id; @@ -2673,8 +2672,8 @@ static void radial_control_paint_cursor(bContext *C, int x, int y, void *customd } /* Keep cursor in the original place */ - x = rc->initial_mouse[0] - ar->winrct.xmin; - y = rc->initial_mouse[1] - ar->winrct.ymin; + x = rc->initial_mouse[0]; + y = rc->initial_mouse[1]; gpuTranslate2f((float)x, (float)y); glEnable(GL_BLEND);