From d5e9eb7d76792ef019021d64a7229a82b10fdb62 Mon Sep 17 00:00:00 2001 From: Matt Ebb <matt@mke3.net> Date: Sun, 21 Jun 2009 22:17:06 +0000 Subject: [PATCH] * fix for small bug in volume texture stack --- source/blender/render/intern/source/texture.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/source/blender/render/intern/source/texture.c b/source/blender/render/intern/source/texture.c index d1115e1d399..5df814358d5 100644 --- a/source/blender/render/intern/source/texture.c +++ b/source/blender/render/intern/source/texture.c @@ -1289,7 +1289,7 @@ static int multitex(Tex *tex, float *texvec, float *dxt, float *dyt, int osatex, texres->tg= col[1]; texres->tb= col[2]; texres->ta= col[3]; - retval |= 1; + retval |= TEX_RGB; } } return retval; @@ -1636,8 +1636,11 @@ void do_volume_tex(ShadeInput *shi, float *xyz, int mapto_flag, float *col, floa tcol[0]=texres.tr; tcol[1]=texres.tg; tcol[2]=texres.tb; + if(texres.talpha) + texres.tin= texres.ta; } + /* used for emit */ if((mapto_flag & MAP_COL) && (mtex->mapto & MAP_COL)) { texture_rgb_blend(col, tcol, col, texres.tin, colfac, mtex->blendtype); } -- GitLab