diff options
author | Antony Riakiotakis <kalast@gmail.com> | 2014-04-28 00:38:21 +0400 |
---|---|---|
committer | Antony Riakiotakis <kalast@gmail.com> | 2014-04-28 00:38:39 +0400 |
commit | a2df2a637e83cef856074b886055eccbc04ae052 (patch) | |
tree | c800c98e038846daac1aef5d22e837707b3fefe7 /source/blender/editors/interface/interface_icons.c | |
parent | f328f45e22abafbb4eb88fc441c9b3707624901f (diff) |
Two changes:
* Buffer icons are usually in straight space (since we load from pngs)
so use src_alpha in OpenGL for blending.
* Allow blending for preview icons. This will be useful for the next
commit...
Diffstat (limited to 'source/blender/editors/interface/interface_icons.c')
-rw-r--r-- | source/blender/editors/interface/interface_icons.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/interface/interface_icons.c b/source/blender/editors/interface/interface_icons.c index f580bd6b5f2..cbbb6a2a255 100644 --- a/source/blender/editors/interface/interface_icons.c +++ b/source/blender/editors/interface/interface_icons.c @@ -1137,7 +1137,7 @@ static void icon_draw_size(float x, float y, int icon_id, float aspect, float al #endif if (!iimg->rect) return; /* something has gone wrong! */ - glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA); + glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); icon_draw_rect(x, y, w, h, aspect, iimg->w, iimg->h, iimg->rect, alpha, rgb, is_preview); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); } |