Merge branch 'master' into blender2.8

1 files changed, 8 insertions, 3 deletions

diff --git a/source/blender/editors/interface/interface_region_tooltip.c b/source/blender/editors/interface/interface_region_tooltip.c
index 3ff3e7d7a21..7c2a171e7d4 100644
--- a/source/blender/editors/interface/interface_region_tooltip.c
+++ b/source/blender/editors/interface/interface_region_tooltip.c
@@ -29,6 +29,14 @@
  * ToolTip Region and Construction
  */
 
+/* TODO(campbell):
+ * We may want to have a higher level API that initializes a timer,
+ * checks for mouse motion and clears the tool-tip afterwards.
+ * We never want multiple tool-tips at once so this could be handled on the window / window-manager level.
+ *
+ * For now it's not a priority, so leave as-is.
+ */
+
 #include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
@@ -97,7 +105,6 @@ typedef struct uiTooltipField {
 
 } uiTooltipField;
 
-#define MAX_TOOLTIP_LINES 8
 typedef struct uiTooltipData {
 	rcti bbox;
 	uiTooltipField *fields;
@@ -609,8 +616,6 @@ static uiTooltipData *ui_tooltip_data_from_button(bContext *C, uiBut *but)
 	if (rna_prop.strinfo)
 		MEM_freeN(rna_prop.strinfo);
 
-	BLI_assert(data->fields_len < MAX_TOOLTIP_LINES);
-
 	if (data->fields_len == 0) {
 		MEM_freeN(data);
 		return NULL;