diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2014-10-13 22:08:55 +0400 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2014-10-13 22:09:37 +0400 |
| commit | d665095e0d5b45db8595bc72205be46640d54898 (patch) | |
| tree | fb58d6ee981c057dc1325ee8894e0c9c988c0a9c /source/blender/editors/interface | |
| parent | f9cbb908a3fbd73970920def8356993b9e016d1d (diff) | |
Filter out pie spawn button events.
The reason being, with the current system of quick selection, it's
possible to spawn an operator after confirmation, especially for cases
with modifier buttons.
Diffstat (limited to 'source/blender/editors/interface')
| -rw-r--r-- | source/blender/editors/interface/interface_regions.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/source/blender/editors/interface/interface_regions.c b/source/blender/editors/interface/interface_regions.c index e743cb50a83..353106db8df 100644 --- a/source/blender/editors/interface/interface_regions.c +++ b/source/blender/editors/interface/interface_regions.c @@ -2715,10 +2715,6 @@ uiPieMenu *uiPieMenuBegin(struct bContext *C, const char *title, int icon, const wmWindow *win = CTX_wm_window(C); - /* allow respawning a pie from the last pie event */ - if (event->type == win->lock_pie_event && event->type != win->last_pie_event) - return NULL; - style = UI_GetStyleDraw(); pie = MEM_callocN(sizeof(uiPopupMenu), "pie menu"); @@ -2805,8 +2801,7 @@ void uiPieMenuInvoke(struct bContext *C, const char *idname, const wmEvent *even if (mt->poll && mt->poll(C, mt) == 0) return; - if (!(pie = uiPieMenuBegin(C, IFACE_(mt->label), ICON_NONE, event))) - return; + pie = uiPieMenuBegin(C, IFACE_(mt->label), ICON_NONE, event); layout = uiPieMenuLayout(pie); menu.layout = layout; @@ -2827,9 +2822,7 @@ void uiPieOperatorEnumInvoke(struct bContext *C, const char *title, const char * uiPieMenu *pie; uiLayout *layout; - if (!(pie = uiPieMenuBegin(C, IFACE_(title), ICON_NONE, event))) - return; - + pie = uiPieMenuBegin(C, IFACE_(title), ICON_NONE, event); layout = uiPieMenuLayout(pie); layout = uiLayoutRadial(layout); @@ -2859,8 +2852,7 @@ void uiPieEnumInvoke(struct bContext *C, const char *title, const char *path, return; } - if (!(pie = uiPieMenuBegin(C, IFACE_(title), ICON_NONE, event))) - return; + pie = uiPieMenuBegin(C, IFACE_(title), ICON_NONE, event); layout = uiPieMenuLayout(pie); |