Merge branch 'master' into blender2.8

2018-01-25 22:20:27 +11:00
parent fd4d7fbf13 2d46ea52cd
commit 5836293990
2 changed files with 12 additions and 2 deletions
--- 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);
+		}
 	}
 }