[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14777] trunk/blender/source/blender/src/ drawseq.c: sequencer non-square-pixel display didnt offset correctly, also made this only work with images.

[Campbell Barton]

Revision: 14777
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14777
Author:   campbellbarton
Date:     2008-05-10 14:43:53 +0200 (Sat, 10 May 2008)

Log Message:
-----------
sequencer non-square-pixel display didnt offset correctly, also made this only 
work with images. (not luma waveforms etc)

Modified Paths:
--------------
    trunk/blender/source/blender/src/drawseq.c

Modified: trunk/blender/source/blender/src/drawseq.c
===================================================================
--- trunk/blender/source/blender/src/drawseq.c  2008-05-10 12:33:15 UTC (rev 
14776)
+++ trunk/blender/source/blender/src/drawseq.c  2008-05-10 12:43:53 UTC (rev 
14777)
@@ -857,15 +857,18 @@
                zoom = -1.0/sseq->zoom;
        }
 
-       /* calc location */
-       x1= (sa->winx-zoom*ibuf->x)/2 + sseq->xof;
-       y1= (sa->winy-zoom*ibuf->y)/2 + sseq->yof;
-
        /* needed for gla draw */
        glaDefine2DArea(&curarea->winrct);
+       if (sseq->mainb == SEQ_DRAW_IMG_IMBUF) {
+               zoomx = zoom * ((float)G.scene->r.xasp / 
(float)G.scene->r.yasp);
+               zoomy = zoom;
+       } else {
+               zoomx = zoomy = zoom;
+       }
 
-       zoomx = zoom * ((float)G.scene->r.xasp / (float)G.scene->r.yasp);
-       zoomy = zoom;
+       /* calc location */
+       x1= (sa->winx-zoomx*ibuf->x)/2 + sseq->xof;
+       y1= (sa->winy-zoomy*ibuf->y)/2 + sseq->yof;
        
        glPixelZoom(zoomx, zoomy);
        


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