diff options
| author | Jeroen Bakker <j.bakker@atmind.nl> | 2018-05-02 18:37:37 +0300 |
|---|---|---|
| committer | Jeroen Bakker <j.bakker@atmind.nl> | 2018-05-02 18:37:37 +0300 |
| commit | d8778311154bdf08f509654ae56d63734e51232f (patch) | |
| tree | 091ee60bf207a2a98004c3e7bfd0ed310b8bb53c | |
| parent | f0d67d8f6a01d606d6090cc6dfdb3fdc6a6e728c (diff) | |
| parent | b6b17338c24011d078e012329ec21c61c61c96de (diff) | |
Merge branch 'blender2.8' of git.blender.org:blender into blender2.8
| -rw-r--r-- | source/blender/editors/interface/interface_region_tooltip.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/editors/interface/interface_region_tooltip.c b/source/blender/editors/interface/interface_region_tooltip.c index 449e783b03e..d016deb26cb 100644 --- a/source/blender/editors/interface/interface_region_tooltip.c +++ b/source/blender/editors/interface/interface_region_tooltip.c @@ -901,6 +901,11 @@ ARegion *UI_tooltip_create_from_button(bContext *C, ARegion *butregion, uiBut *b RNA_string_get(but->opptr, "keymap", keymap); if (keymap[0]) { ScrArea *sa = CTX_wm_area(C); + /* It happens in rare cases, for tooltips originated from the toolbar. + * It is hard to reproduce, but it happens when the mouse is nowhere near the actual tool. */ + if (sa == NULL) { + return NULL; + } wmKeyMap *km = WM_keymap_find_all(C, keymap, sa->spacetype, RGN_TYPE_WINDOW); if (km != NULL) { data = ui_tooltip_data_from_keymap(C, km); |