archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

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

Browse Source 
not correct.
This commit is contained in:
Brecht Van Lommel
2008-02-21 14:50:07 +00:00
parent 36c41c96e7
commit 1899afcced
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/src/drawimage.c
View File

@@ -1737,13 +1737,11 @@ static void sima_draw_alpha_backdrop(SpaceImage *sima, float x1, float y1, float
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 @@ void drawimagespace(ScrArea *sa, void *spacedata)
}
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)