[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13798] trunk/blender/source/blender/src/ drawimage.c:

[Brecht Van Lommel]

Revision: 13798
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13798
Author:   blendix
Date:     2008-02-21 15:50:07 +0100 (Thu, 21 Feb 2008)

Log Message:
-----------

Fix for bug #8313: image editor alpha drawing + user aspect ratio was
not correct.

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

Modified: trunk/blender/source/blender/src/drawimage.c
===================================================================
--- trunk/blender/source/blender/src/drawimage.c	2008-02-21 14:28:20 UTC (rev 13797)
+++ trunk/blender/source/blender/src/drawimage.c	2008-02-21 14:50:07 UTC (rev 13798)
@@ -1737,13 +1737,11 @@
 	glColor3ub(100, 100, 100);
 	glRectf(x1, y1, x1 + sima->zoom*xsize, y1 + sima->zoom*ysize);
 	glColor3ub(160, 160, 160);
-	
+
 	glEnable(GL_POLYGON_STIPPLE);
 	glPolygonStipple(checker_stipple);
 	glRectf(x1, y1, x1 + sima->zoom*xsize, y1 + sima->zoom*ysize);
-	glEnd();
 	glDisable(GL_POLYGON_STIPPLE);
-	return;
 }
 
 static void sima_draw_alpha_pixels(float x1, float y1, int rectx, int recty, unsigned int *recti)
@@ -2058,7 +2056,7 @@
 						}
 						else {
 							if(sima->flag & SI_USE_ALPHA) {
-								sima_draw_alpha_backdrop(sima, x1_rep, y1_rep, (float)ibuf->x, (float)ibuf->y);
+								sima_draw_alpha_backdrop(sima, x1_rep, y1_rep, ibuf->x*xuser_asp, ibuf->y*yuser_asp);
 								glEnable(GL_BLEND);
 								/*use key alpha if the IMA_DO_PREMUL option is set.*/
 								if (sima->iuser.flag & IMA_DO_PREMUL)