diff options
| author | Joseph Eagar <joeedh@gmail.com> | 2008-02-23 01:23:58 +0300 |
|---|---|---|
| committer | Joseph Eagar <joeedh@gmail.com> | 2008-02-23 01:23:58 +0300 |
| commit | 0e233b3213a21449399d91b9ee841c235fbba4d7 (patch) | |
| tree | da61feed9bf0d7274c7725f909e170a39d0e1561 /source/blender/src/drawimage.c | |
| parent | 28fb57804835e41f51da9bfdecda6b49ede439f2 (diff) | |
=Reversion of premul bugfix=
Reversion of premul bugfix, as it was apparently not
working all that well.
Note that this brings back the bug where the erase alpha
paint tool won't display correctly, since the UV image
editor just draws images in key alpha now.
Diffstat (limited to 'source/blender/src/drawimage.c')
| -rw-r--r-- | source/blender/src/drawimage.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/source/blender/src/drawimage.c b/source/blender/src/drawimage.c index 3db93cdba02..da00e644a6b 100644 --- a/source/blender/src/drawimage.c +++ b/source/blender/src/drawimage.c @@ -2058,11 +2058,7 @@ void drawimagespace(ScrArea *sa, void *spacedata) if(sima->flag & SI_USE_ALPHA) { 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) - glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - else - glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA); + glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA); } /* detect if we need to redo the curve map. |