Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2018-04-30 20:47:33 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2018-04-30 21:02:39 +0300
commit33bb8b785a938da64d55687d50f1a78cd6bbb733 (patch)
treeb993520acb84bbb14c87a055d0b672c2c67011c7 /source/blender/windowmanager/intern/wm_operators.c
parentf56b7fb863522e8a61cd2ed72117c910fb73aab2 (diff)
Fix T54900: radial control drawing in wrong place after recent WM changes.
Diffstat (limited to 'source/blender/windowmanager/intern/wm_operators.c')
-rw-r--r--source/blender/windowmanager/intern/wm_operators.c7
1 files 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);