diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-10-27 16:44:31 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-10-27 16:44:31 +0300 |
| commit | c036db9f57ff1bf5762e2b4dda802ee41cdbd115 (patch) | |
| tree | fe3f287df6b33de90d83ef9a13b5ed81d43313b6 /source/blender/editors/interface | |
| parent | 1e630d79fbc0fabe2f6321aafbf62415f7c1520e (diff) | |
| parent | 9b6aa740be31b395fc62b4e6e491cba8c8f977e3 (diff) | |
Merge branch 'blender-v2.81-release'
Diffstat (limited to 'source/blender/editors/interface')
| -rw-r--r-- | source/blender/editors/interface/interface.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c index 54fd91e5361..ff6b65ffbfc 100644 --- a/source/blender/editors/interface/interface.c +++ b/source/blender/editors/interface/interface.c @@ -2624,10 +2624,10 @@ void ui_but_string_get_ex(uiBut *but, BLI_assert(0); } - if (!buf) { + if (buf == NULL) { str[0] = '\0'; } - else if (buf && buf != str) { + else if (buf != str) { BLI_assert(maxlen <= buf_len + 1); /* string was too long, we have to truncate */ if (UI_but_is_utf8(but)) { |