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:
authorSergey Sharybin <sergey.vfx@gmail.com>2012-07-31 20:40:14 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2012-07-31 20:40:14 +0400
commitb9f72394fddf69808deaa4f66668cb4f62ff9f7e (patch)
tree4067762721849586469e2ca34d82a4e0ee4d3743 /source/blender/editors/mask
parent4473b846fbaf9c92e76f653ec28a5255db446d1a (diff)
Fixed wrong mask display with clip's pixel aspect and image editor display aspect != 1.0
Diffstat (limited to 'source/blender/editors/mask')
-rw-r--r--source/blender/editors/mask/mask_draw.c10
1 files changed, 5 insertions, 5 deletions
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 */