griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

use clip alpha setting for empty-image drawing.

Browse Source
This commit is contained in:
Campbell Barton
2013-03-21 15:43:05 +00:00
parent f3db38de56
commit a8b6b5ec4c
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/blender/editors/space_view3d/drawobject.c
View File

@@ -603,10 +603,16 @@ static void draw_empty_image(Object *ob, const short dflag, const unsigned char
glScalef(scale * sca_x, scale * sca_y, 1.0f);
if (ibuf && ibuf->rect) {
const bool use_clip = (U.glalphaclip != 1.0f);
/* Setup GL params */
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
if (use_clip) {
glEnable(GL_ALPHA_TEST);
glAlphaFunc(GL_GREATER, U.glalphaclip);
}
/* Use the object color and alpha */
glColor4fv(ob->col);
@@ -615,6 +621,11 @@ static void draw_empty_image(Object *ob, const short dflag, const unsigned char
glPixelTransferf(GL_ALPHA_SCALE, 1.0f);
glDisable(GL_BLEND);
if (use_clip) {
glDisable(GL_ALPHA_TEST);
glAlphaFunc(GL_GREATER, 0.0f);
}
}
if ((dflag & DRAW_CONSTCOLOR) == 0) {