blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 760 Projects 19 Wiki Activity

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.
This commit is contained in:
Dalai Felinto 2018-05-02 18:22:09 +02:00
parent d877831115
commit 965e6ed54f
Notes: blender-bot 2023-02-14 05:57:07 +01:00 
Referenced by issue #54864, Assert when changing interface display scale
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/editors/screen/area.c
View File

@ -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;