archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

=Reversion of premul bugfix=

Browse Source 
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.
This commit is contained in:
Joseph Eagar
2008-02-22 22:23:58 +00:00
parent 28fb578048
commit 0e233b3213
8 changed files with 34 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/render/intern/source/texture.c
View File

@@ -1138,13 +1138,6 @@ static int multitex(Tex *tex, float *texvec, float *dxt, float *dyt, int osatex,
if(osatex) retval= imagewraposa(tex, tex->ima, NULL, texvec, dxt, dyt, texres);
else retval= imagewrap(tex, tex->ima, NULL, texvec, texres);
tag_image_time(tex->ima); /* tag image as having being used */
/*do premul if necassary*/
if (tex->iuser.flag & IMA_DO_PREMUL) {
texres->tr *= texres->ta;
texres->tg *= texres->ta;
texres->tb *= texres->ta;
}
break;
case TEX_PLUGIN:
retval= plugintex(tex, texvec, dxt, dyt, osatex, texres);