archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: fix compiler warnings.

Browse Source
This commit is contained in:
Brecht Van Lommel
2019-04-14 19:04:37 +02:00
parent f73b3178f7
commit 427f4c2321
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/editors/screen/screen_ops.c
View File

@@ -2280,7 +2280,6 @@ typedef struct RegionMoveData {
static int area_max_regionsize(ScrArea *sa, ARegion *scalear, AZEdge edge) static int area_max_regionsize(ScrArea *sa, ARegion *scalear, AZEdge edge)
{ {
ARegion *ar;
int dist; int dist;
/* regions in regions. */ /* regions in regions. */
@@ -2288,11 +2287,11 @@ static int area_max_regionsize(ScrArea *sa, ARegion *scalear, AZEdge edge)
const int align = scalear->alignment & RGN_ALIGN_ENUM_MASK; const int align = scalear->alignment & RGN_ALIGN_ENUM_MASK;
if (ELEM(align, RGN_ALIGN_TOP, RGN_ALIGN_BOTTOM)) { if (ELEM(align, RGN_ALIGN_TOP, RGN_ALIGN_BOTTOM)) {
ar = scalear->prev; ARegion *ar = scalear->prev;
dist = ar->winy + scalear->winy - U.pixelsize; dist = ar->winy + scalear->winy - U.pixelsize;
} }
else if (ELEM(align, RGN_ALIGN_LEFT, RGN_ALIGN_RIGHT)) { else /* if (ELEM(align, RGN_ALIGN_LEFT, RGN_ALIGN_RIGHT)) */ {
ar = scalear->prev; ARegion *ar = scalear->prev;
dist = ar->winx + scalear->winx - U.pixelsize; dist = ar->winx + scalear->winx - U.pixelsize;
} }
} }
@@ -2306,7 +2305,7 @@ static int area_max_regionsize(ScrArea *sa, ARegion *scalear, AZEdge edge)
/* subtractwidth of regions on opposite side /* subtractwidth of regions on opposite side
* prevents dragging regions into other opposite regions */ * prevents dragging regions into other opposite regions */
for (ar = sa->regionbase.first; ar; ar = ar->next) { for (ARegion *ar = sa->regionbase.first; ar; ar = ar->next) {
if (ar == scalear) if (ar == scalear)
continue; continue;