From 40f45a7eac620fd8b99b3f29f3d0cac3c855dc84 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 1 Dec 2018 19:36:57 +1100 Subject: Cleanup: redundant NULL checks Also use unsigned shifting for values not in int range. --- source/blender/editors/screen/area.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender/editors/screen/area.c') diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c index 94b30f8e3b0..9e73fea12ce 100644 --- a/source/blender/editors/screen/area.c +++ b/source/blender/editors/screen/area.c @@ -1354,7 +1354,7 @@ static void region_rect_recursive(ScrArea *sa, ARegion *ar, rcti *remainder, rct if (ar->winy > 1) ar->sizey = (ar->winy + 0.5f) / UI_DPI_FAC; /* exception for multiple overlapping regions on same spot */ - if (ar->overlap & (alignment != RGN_ALIGN_FLOAT)) { + if (ar->overlap && (alignment != RGN_ALIGN_FLOAT)) { region_overlap_fix(sa, ar); } -- cgit v1.2.3