griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix failing assert when hiding header with asset shelf available

Browse Source 
Old code to prevent multiple overlapping regions at the same place,
wasn't handling the combination of bit flags and the alignment enum in a
single field correctly. Newly introduced flags for the asset shelf
exposed this.

Was asserting on startup for a Pets production file
(`010_0050.anim.blend`).

Steps to reproduce:
* Replace default cube with armature object
* Enter Pose Mode (makes asset shelf available for pose libraries)
* Hide 3D View header
This commit is contained in:
Julian Eisel
2023-12-06 20:43:39 +01:00
parent 06370b5fd6
commit b4d6c231c5
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/blender/editors/screen/area.cc
View File

@@ -1229,10 +1229,11 @@ static void region_overlap_fix(ScrArea *area, ARegion *region)
}
if (region_iter->overlap && ((region_iter->alignment & RGN_SPLIT_PREV) == 0)) {
if (ELEM(region_iter->alignment, RGN_ALIGN_FLOAT)) {
const int align_iter = RGN_ALIGN_ENUM_FROM_MASK(region_iter->alignment);
if (ELEM(align_iter, RGN_ALIGN_FLOAT)) {
continue;
}
align1 = region_iter->alignment;
align1 = align_iter;
if (BLI_rcti_isect(&region_iter->winrct, &region->winrct, nullptr)) {
if (align1 != align) {
/* Left overlapping right or vice-versa, forbid this! */
@@ -1272,13 +1273,13 @@ static void region_overlap_fix(ScrArea *area, ARegion *region)
if (region_iter->flag & (RGN_FLAG_POLL_FAILED | RGN_FLAG_HIDDEN)) {
continue;
}
if (ELEM(region_iter->alignment, RGN_ALIGN_FLOAT)) {
const int align_iter = RGN_ALIGN_ENUM_FROM_MASK(region_iter->alignment);
if (ELEM(align_iter, RGN_ALIGN_FLOAT)) {
continue;
}
if (region_iter->overlap && (region_iter->alignment & RGN_SPLIT_PREV) == 0) {
if ((region_iter->alignment != align) &&
BLI_rcti_isect(&region_iter->winrct, &region->winrct, nullptr))
if ((align_iter != align) && BLI_rcti_isect(&region_iter->winrct, &region->winrct, nullptr))
{
/* Left overlapping right or vice-versa, forbid this! */
region->flag |= RGN_FLAG_TOO_SMALL;