diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-02-21 17:50:07 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-02-21 17:50:07 +0300 |
| commit | 1899afccedcf46b9fba7c76448a24197ad1bfbf1 (patch) | |
| tree | 8420ca1a9b9aadd436c454c23db609b56762bc69 /source/blender/src | |
| parent | 36c41c96e73a77af9c59c36fc27b74e6e139fff7 (diff) | |
Fix for bug #8313: image editor alpha drawing + user aspect ratio was
not correct.
Diffstat (limited to 'source/blender/src')
| -rw-r--r-- | source/blender/src/drawimage.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/source/blender/src/drawimage.c b/source/blender/src/drawimage.c index 0b3b98bde2d..3db93cdba02 100644 --- a/source/blender/src/drawimage.c +++ b/source/blender/src/drawimage.c @@ -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) |