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

Update of older commit (23102) from Bob Holcomb -- fix for Darken mode blending was only in place for nodes, not for general texture blending. This updates texture blending to reflect the fix. Now results don't trend toward black on Darken anymore as factor approaches 0.

Browse Source
This commit is contained in:
Roland Hess
2009-11-09 19:20:48 +00:00
parent 45c0f70e3e
commit 6dd96fcfa8
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1416,11 +1416,11 @@ void texture_rgb_blend(float *in, float *tex, float *out, float fact, float facg
fact*= facg;
facm= 1.0-fact;
col= fact*tex[0];
col= tex[0]+((1-tex[0])*facm);
if(col < out[0]) in[0]= col; else in[0]= out[0];
col= fact*tex[1];
col= tex[1]+((1-tex[1])*facm);
if(col < out[1]) in[1]= col; else in[1]= out[1];
col= fact*tex[2];
col= tex[2]+((1-tex[2])*facm);
if(col < out[2]) in[2]= col; else in[2]= out[2];
break;