From 965e6ed54f058c21ae6096a5449fb3d1e5235821 Mon Sep 17 00:00:00 2001 From: Dalai Felinto Date: Wed, 2 May 2018 18:22:09 +0200 Subject: Fix T54864: Assert when changing interface display scale The asserts were introduced on rB5f6c45498c92 (top-bar). Although the asserts are technically correct, they would fail even in master. And the commit simply added the asserts without fixing the situation itself (as you can see in the report, it is really simple to reproduce this issue). I propose we remove the asserts and bring them back only when the situation itself is fixed. It doesn't make sense to introduce asserts that would fail with the current state of the code. --- source/blender/editors/screen/area.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c index 5e68ad1218d..f243cf686b8 100644 --- a/source/blender/editors/screen/area.c +++ b/source/blender/editors/screen/area.c @@ -1449,10 +1449,15 @@ static void area_calc_totrct(ScrArea *sa, int window_size_x, int window_size_y) if (sa->totrct.ymax < (window_size_y - 1)) { sa->totrct.ymax -= px; } + /* Although the following asserts are correct they lead to a very unstable Blender. + * And the asserts would fail even in 2.7x (they were added in 2.8x as part of the top-bar commit). + * For more details see T54864. */ +#if 0 BLI_assert(sa->totrct.xmin >= 0); BLI_assert(sa->totrct.xmax >= 0); BLI_assert(sa->totrct.ymin >= 0); BLI_assert(sa->totrct.ymax >= 0); +#endif /* for speedup */ sa->winx = BLI_rcti_size_x(&sa->totrct) + 1; -- cgit v1.2.3