[Bf-blender-cvs] [33bb8b785a9] blender2.8: Fix T54900: radial control drawing in wrong place after recent WM changes.
Brecht Van Lommel
noreply at git.blender.org
Mon Apr 30 20:02:56 CEST 2018
Commit: 33bb8b785a938da64d55687d50f1a78cd6bbb733
Author: Brecht Van Lommel
Date: Mon Apr 30 19:47:33 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB33bb8b785a938da64d55687d50f1a78cd6bbb733
Fix T54900: radial control drawing in wrong place after recent WM changes.
===================================================================
M source/blender/windowmanager/intern/wm_operators.c
===================================================================
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);
More information about the Bf-blender-cvs
mailing list