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

fix [#29761] Texture painting with interpolation ignores use alpha

Browse Source 
reporter - Shawn Zilbert (enigmatic) included patch.
This commit is contained in:
Campbell Barton
2012-01-03 02:26:32 +00:00
parent 8983d68fd8
commit dcdcaf25ba
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/render/intern/source/imagetexture.c
View File

@@ -203,6 +203,13 @@ int imagewrap(Tex *tex, Image *ima, ImBuf *ibuf, const float texvec[3], TexResul
ibuf->rect+= (ibuf->x*ibuf->y);
}
/* keep this before interpolation [#29761] */
if (tex->imaflag & TEX_USEALPHA) {
if ((tex->imaflag & TEX_CALCALPHA) == 0) {
texres->talpha = TRUE;
}
}
/* interpolate */
if (tex->imaflag & TEX_INTERPOL) {
float filterx, filtery;
@@ -225,11 +232,6 @@ int imagewrap(Tex *tex, Image *ima, ImBuf *ibuf, const float texvec[3], TexResul
ibuf->rect-= (ibuf->x*ibuf->y);
}
if(tex->imaflag & TEX_USEALPHA) {
if(tex->imaflag & TEX_CALCALPHA);
else texres->talpha= 1;
}
if(texres->nor) {
if(tex->imaflag & TEX_NORMALMAP) {
// qdn: normal from color