From 6dd96fcfa866316b8c278906edaa0c4b43ee5c92 Mon Sep 17 00:00:00 2001 From: Roland Hess Date: Mon, 9 Nov 2009 19:20:48 +0000 Subject: [PATCH] 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. --- source/blender/render/intern/source/texture.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source/blender/render/intern/source/texture.c b/source/blender/render/intern/source/texture.c index 9510dc15e5a..a74bd3e8041 100644 --- a/source/blender/render/intern/source/texture.c +++ b/source/blender/render/intern/source/texture.c @@ -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;