Merge branch 'master' into blender2.8

2 files changed, 12 insertions, 2 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);
+		}
 	}
 }
 
diff --git a/source/blender/windowmanager/WM_types.h b/source/blender/windowmanager/WM_types.h
index 7254301b874..8ec6438ca45 100644
--- a/source/blender/windowmanager/WM_types.h
+++ b/source/blender/windowmanager/WM_types.h
@@ -702,12 +702,20 @@ typedef struct wmDropBox {
 
 } wmDropBox;
 
+/**
+ * Struct to store tool-tip timer and possible creation if the time is reached.
+ * Allows UI code to call #WM_tooltip_timer_init without each user having to handle the timer.
+ */
 typedef struct wmTooltipState {
+	/** Create tooltip on this event. */
 	struct wmTimer *timer;
+	/** The region the tooltip is created in. */
 	struct ARegion *region_from;
+	/** The tooltip region. */
 	struct ARegion *region;
+	/** Create the tooltip region (assign to 'region'). */
 	struct ARegion *(*init)(struct bContext *, struct ARegion *, bool *r_exit_on_event);
-	/* Exit on any event, not needed for buttons since their highlight state is used. */
+	/** Exit on any event, not needed for buttons since their highlight state is used. */
 	bool exit_on_event;
 } wmTooltipState;