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

code cleanup: use BLI_RCT_SIZE macro

Browse Source
This commit is contained in:
Campbell Barton
2012-08-20 23:06:17 +00:00
parent 94ce9505a9
commit 77f47799dd
53 changed files with 346 additions and 334 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/editors/space_image/image_ops.c
View File

@@ -98,9 +98,9 @@ static void sima_zoom_set(SpaceImage *sima, ARegion *ar, float zoom, float locat
if ((width < 4) && (height < 4))
sima->zoom = oldzoom;
else if ((ar->winrct.xmax - ar->winrct.xmin) <= sima->zoom)
else if (BLI_RCT_SIZE_X(&ar->winrct) <= sima->zoom)
sima->zoom = oldzoom;
else if ((ar->winrct.ymax - ar->winrct.ymin) <= sima->zoom)
else if (BLI_RCT_SIZE_Y(&ar->winrct) <= sima->zoom)
sima->zoom = oldzoom;
}
@@ -581,8 +581,8 @@ static int image_view_all_exec(bContext *C, wmOperator *UNUSED(op))
h = height * aspy;
/* check if the image will fit in the image with (zoom == 1) */
width = ar->winrct.xmax - ar->winrct.xmin + 1;
height = ar->winrct.ymax - ar->winrct.ymin + 1;
width = BLI_RCT_SIZE_X(&ar->winrct) + 1;
height = BLI_RCT_SIZE_Y(&ar->winrct) + 1;
if ((w >= width || h >= height) && (width > 0 && height > 0)) {
/* find the zoom value that will fit the image in the image space */