diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-01-25 14:20:27 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-01-25 14:20:27 +0300 |
| commit | 58362939906b31fce02b8f9598f4321e83971b7d (patch) | |
| tree | 063fc98223075259e7ec2abe97ede97748d69af8 /source/blender/editors | |
| parent | fd4d7fbf131a02862b93915d65559d66177a6f18 (diff) | |
| parent | 2d46ea52cdd69f929ad7efe8e482cfc0a16de35f (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/interface/interface_handlers.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index 1e31837f088..3af64c8c5a6 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -7720,7 +7720,9 @@ void UI_but_tooltip_timer_remove(bContext *C, uiBut *but) data->autoopentimer = NULL; } - WM_tooltip_clear(C, data->window); + if (data->window) { + WM_tooltip_clear(C, data->window); + } } } |