Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2019-04-14 20:04:37 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2019-04-14 20:54:51 +0300
commit427f4c23211f69700820f61e00cb5c19ee6ce3f7 (patch)
treecdf47417c35b2b9b51e9fed1c5209b9973e3a554 /source/blender
parentf73b3178f7667c06bbc30499e2e449b4e386b155 (diff)
Cleanup: fix compiler warnings.
Diffstat (limited to 'source/blender')
-rw-r--r--source/blender/editors/screen/screen_ops.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c
index cd2a610813e..f475a87df59 100644
--- a/source/blender/editors/screen/screen_ops.c
+++ b/source/blender/editors/screen/screen_ops.c
@@ -2280,7 +2280,6 @@ typedef struct RegionMoveData {
static int area_max_regionsize(ScrArea *sa, ARegion *scalear, AZEdge edge)
{
- ARegion *ar;
int dist;
/* 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;
if (ELEM(align, RGN_ALIGN_TOP, RGN_ALIGN_BOTTOM)) {
- ar = scalear->prev;
+ ARegion *ar = scalear->prev;
dist = ar->winy + scalear->winy - U.pixelsize;
}
- else if (ELEM(align, RGN_ALIGN_LEFT, RGN_ALIGN_RIGHT)) {
- ar = scalear->prev;
+ else /* if (ELEM(align, RGN_ALIGN_LEFT, RGN_ALIGN_RIGHT)) */ {
+ ARegion *ar = scalear->prev;
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
* 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)
continue;