diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2016-06-13 18:36:27 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2016-06-13 18:52:35 +0300 |
| commit | b0985b393ce0335ffbdf5a67bc7cd01d55323ad1 (patch) | |
| tree | a123955078ec7439df4b1fa62ae5ae852a7d4e44 | |
| parent | 520691e5912d2eec45c910231626886da51e2944 (diff) | |
Fix T48595: UI glitch with driver menu re-opening
Holding Ctrl-D would keep opening driver menus.
| -rw-r--r-- | source/blender/editors/interface/interface_handlers.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index ff4e11ac58b..133487e1846 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -6981,13 +6981,15 @@ static int ui_do_button(bContext *C, uiBlock *block, uiBut *but, const wmEvent * !IS_EVENT_MOD(event, shift, oskey) && (event->val == KM_PRESS)) { - if (event->alt) - ui_but_anim_remove_driver(C); - else if (event->ctrl) - ui_but_anim_add_driver(C); - - ED_region_tag_redraw(data->region); - + /* quick check to prevent this opening within the popup menu its self */ + if (!ELEM(NULL, but->rnapoin.data, but->rnaprop)) { + if (event->alt) + ui_but_anim_remove_driver(C); + else if (event->ctrl) + ui_but_anim_add_driver(C); + + ED_region_tag_redraw(data->region); + } return WM_UI_HANDLER_BREAK; } /* handle keyingsets */ |