diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-06-07 18:08:55 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-07 18:08:55 +0300 |
commit | 38232871791e88eb8294441c013171113cb61012 (patch) | |
tree | 5c8a12011840a9991411e0b790a4dfc3b6b9bd91 /source/blender/editors/interface | |
parent | 8dc33a81b09a403e57f7830d993d4484f6d85c40 (diff) | |
parent | d274c64d22da51473839d87618ba0dc0a0f1fa42 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/interface')
-rw-r--r-- | source/blender/editors/interface/interface_region_menu_pie.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/source/blender/editors/interface/interface_region_menu_pie.c b/source/blender/editors/interface/interface_region_menu_pie.c index 0c43b787a84..504e1807a8f 100644 --- a/source/blender/editors/interface/interface_region_menu_pie.c +++ b/source/blender/editors/interface/interface_region_menu_pie.c @@ -150,8 +150,16 @@ uiPieMenu *UI_pie_menu_begin(struct bContext *C, const char *title, int icon, co } pie->layout = UI_block_layout(pie->block_radial, UI_LAYOUT_VERTICAL, UI_LAYOUT_PIEMENU, 0, 0, 200, 0, 0, style); - pie->mx = event->x; - pie->my = event->y; + + /* Open from where we started dragging. */ + if (event->val == KM_CLICK_DRAG) { + pie->mx = event->prevclickx; + pie->my = event->prevclicky; + } + else { + pie->mx = event->x; + pie->my = event->y; + } /* create title button */ if (title[0]) { |