[Bf-blender-cvs] [bb3a030306a] blender2.8: Fix issue with hidden headers after previous commit.
Brecht Van Lommel
noreply at git.blender.org
Sun May 6 16:08:58 CEST 2018
Commit: bb3a030306a275bfb7ac3100103f7ed9fa9ad8c8
Author: Brecht Van Lommel
Date: Sun May 6 16:07:34 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBbb3a030306a275bfb7ac3100103f7ed9fa9ad8c8
Fix issue with hidden headers after previous commit.
===================================================================
M source/blender/editors/screen/area.c
===================================================================
diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c
index f8482eba67e..611e5fdd636 100644
--- a/source/blender/editors/screen/area.c
+++ b/source/blender/editors/screen/area.c
@@ -1114,6 +1114,10 @@ static void region_overlap_fix(ScrArea *sa, ARegion *ar)
/* find overlapping previous region on same place */
for (ar1 = ar->prev; ar1; ar1 = ar1->prev) {
+ if (ar1->flag & (RGN_FLAG_HIDDEN)) {
+ continue;
+ }
+
if (ar1->overlap && ((ar1->alignment & RGN_SPLIT_PREV) == 0)) {
align1 = ar1->alignment;
if (BLI_rcti_isect(&ar1->winrct, &ar->winrct, NULL)) {
@@ -1153,6 +1157,10 @@ static void region_overlap_fix(ScrArea *sa, ARegion *ar)
/* At this point, 'ar' is in its final position and still open.
* Make a final check it does not overlap any previous 'other side' region. */
for (ar1 = ar->prev; ar1; ar1 = ar1->prev) {
+ if (ar1->flag & (RGN_FLAG_HIDDEN)) {
+ continue;
+ }
+
if (ar1->overlap && (ar1->alignment & RGN_SPLIT_PREV) == 0) {
if ((ar1->alignment != align) && BLI_rcti_isect(&ar1->winrct, &ar->winrct, NULL)) {
/* Left overlapping right or vice-versa, forbid this! */
More information about the Bf-blender-cvs
mailing list