Revision: 49426
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49426
Author:   nazgul
Date:     2012-07-31 16:40:14 +0000 (Tue, 31 Jul 2012)
Log Message:
-----------
Fixed wrong mask display with clip's pixel aspect and image editor display 
aspect != 1.0

Modified Paths:
--------------
    trunk/blender/source/blender/editors/mask/mask_draw.c

Modified: trunk/blender/source/blender/editors/mask/mask_draw.c
===================================================================
--- trunk/blender/source/blender/editors/mask/mask_draw.c       2012-07-31 
16:37:47 UTC (rev 49425)
+++ trunk/blender/source/blender/editors/mask/mask_draw.c       2012-07-31 
16:40:14 UTC (rev 49426)
@@ -507,17 +507,17 @@
        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 */

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to