From b9f72394fddf69808deaa4f66668cb4f62ff9f7e Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Tue, 31 Jul 2012 16:40:14 +0000 Subject: Fixed wrong mask display with clip's pixel aspect and image editor display aspect != 1.0 --- source/blender/editors/mask/mask_draw.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'source/blender/editors/mask') diff --git a/source/blender/editors/mask/mask_draw.c b/source/blender/editors/mask/mask_draw.c index f416e31c1de..f01fad10034 100644 --- a/source/blender/editors/mask/mask_draw.c +++ b/source/blender/editors/mask/mask_draw.c @@ -507,17 +507,17 @@ void ED_mask_draw_region(Mask *mask, ARegion *ar, y += v2d->tot.ymin * zoomy; /* frame the image */ - maxdim = maxf(w, h); - if (w == h) { + maxdim = maxf(width, height); + if (width == height) { xofs = yofs = 0; } - else if (w < h) { - xofs = ((h - w) / -2.0f) * zoomx; + else if (width < height) { + xofs = ((height - width) / -2.0f) * zoomx; yofs = 0.0f; } else { /* (width > height) */ xofs = 0.0f; - yofs = ((w - h) / -2.0f) * zoomy; + yofs = ((width - height) / -2.0f) * zoomy; } /* apply transformation so mask editing tools will assume drawing from the origin in normalized space */ -- cgit v1.2.3