From d5a8c0c4144ac70d97aec77669178fc51da02c4c Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 28 Jun 2018 10:45:39 +0200 Subject: [PATCH 1/2] UI: use two dot ellipses Use less space for sign used when we don't have enough. --- source/blender/editors/interface/interface_widgets.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c index b740b410c1a..92c7f13f140 100644 --- a/source/blender/editors/interface/interface_widgets.c +++ b/source/blender/editors/interface/interface_widgets.c @@ -1033,8 +1033,8 @@ float UI_text_clip_middle_ex( strwidth = BLF_width(fstyle->uifont_id, str, max_len); if ((okwidth > 0.0f) && (strwidth > okwidth)) { - /* utf8 ellipsis '...', some compilers complain */ - const char sep[] = {0xe2, 0x80, 0xa6, 0x0}; + /* utf8 ellipsis '..', some compilers complain */ + const char sep[] = {0xe2, 0x80, 0xA5, 0x0}; const int sep_len = sizeof(sep) - 1; const float sep_strwidth = BLF_width(fstyle->uifont_id, sep, sep_len + 1); float parts_strwidth; From 274bde23fb57c014af727fb787c6e8a3342f6240 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 28 Jun 2018 10:48:06 +0200 Subject: [PATCH 2/2] CMake: enable WITH_ASSERT_ABORT by default Assert from BLI_assert by default in debug builds (instead of just printing a warning). Some developers ignored this, causing errors for others. Better debug builds cause hard error so code isn't ignored. Disabling is still useful when bisecting or testing outdated code. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d1b35b1c562..46d91286467 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -444,7 +444,7 @@ mark_as_advanced(WITH_MEM_VALGRIND) option(WITH_CXX_GUARDEDALLOC "Enable GuardedAlloc for C++ memory allocation tracking (only enable for development)" OFF) mark_as_advanced(WITH_CXX_GUARDEDALLOC) -option(WITH_ASSERT_ABORT "Call abort() when raising an assertion through BLI_assert()" OFF) +option(WITH_ASSERT_ABORT "Call abort() when raising an assertion through BLI_assert()" ON) mark_as_advanced(WITH_ASSERT_ABORT) option(WITH_BOOST "Enable features depending on boost" ON)