sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix for bug #8750: depremul in the image texture code should check

Browse Source 
with an epsilon rather than 0.0f, could give random spots otherwise
with e.g. calcalpha + negalpha.
This commit is contained in:
Brecht Van Lommel 2008-03-26 15:25:56 +00:00
parent ba1f58ea73
commit 2af78ac944
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,6 +32,7 @@
#include <string.h> #include <string.h>
#include <fcntl.h> #include <fcntl.h>
#include <math.h> #include <math.h>
#include <float.h>
#ifndef WIN32 #ifndef WIN32
#include <unistd.h> #include <unistd.h>
#else #else
@ -245,7 +246,7 @@ int imagewrap(Tex *tex, Image *ima, ImBuf *ibuf, float *texvec, TexResult *texre
if(tex->flag & TEX_NEGALPHA) texres->ta= 1.0f-texres->ta; if(tex->flag & TEX_NEGALPHA) texres->ta= 1.0f-texres->ta;
/* de-premul, this is being premulled in shade_input_do_shade() */ /* de-premul, this is being premulled in shade_input_do_shade() */
if(texres->ta!=1.0f && texres->ta!=0.0f) { if(texres->ta!=1.0f && texres->ta>FLT_EPSILON) {
fx= 1.0f/texres->ta; fx= 1.0f/texres->ta;
texres->tr*= fx; texres->tr*= fx;
texres->tg*= fx; texres->tg*= fx;
@ -989,7 +990,7 @@ int imagewraposa(Tex *tex, Image *ima, ImBuf *ibuf, float *texvec, float *dxt, f
} }
/* de-premul, this is being premulled in shade_input_do_shade() */ /* de-premul, this is being premulled in shade_input_do_shade() */
if(texres->ta!=1.0f && texres->ta!=0.0f) { if(texres->ta!=1.0f && texres->ta>FLT_EPSILON) {
fx= 1.0f/texres->ta; fx= 1.0f/texres->ta;
texres->tr*= fx; texres->tr*= fx;
texres->tg*= fx; texres->tg*= fx;