Merge remote-tracking branch 'origin/blender-v2.91-release'

2020-11-19 10:43:46 +01:00 · 2020-11-19 10:43:46 +01:00 · 71c6c95aec
parent e5df87b1b9 256e77c987
commit 71c6c95aec
1 changed files with 4 additions and 0 deletions
--- a/source/blender/editors/interface/interface_query.c
+++ b/source/blender/editors/interface/interface_query.c
@ -463,6 +463,10 @@ size_t ui_but_drawstr_len_without_sep_char(const uiBut *but)

 size_t ui_but_tip_len_only_first_line(const uiBut *but)
 {
+  if (but->tip == NULL) {
+    return 0;
+  }
+
  const char *str_sep = strchr(but->tip, '\n');
  if (str_sep != NULL) {
    return (str_sep - but->tip);