Index: source/blender/render/extern/include/RE_shader_ext.h =================================================================== RCS file: /cvsroot/bf-blender/blender/source/blender/render/extern/include/RE_shader_ext.h,v retrieving revision 1.17 diff -p -u -r1.17 RE_shader_ext.h --- source/blender/render/extern/include/RE_shader_ext.h 6 Dec 2006 09:56:20 -0000 1.17 +++ source/blender/render/extern/include/RE_shader_ext.h 6 Dec 2006 16:13:17 -0000 @@ -112,7 +112,7 @@ typedef struct ShadeInput float layerfac; /* texture coordinates */ - float lo[3], gl[3], uv[3], ref[3], orn[3], winco[3], sticky[3], vcol[3], rad[3]; + float lo[3], gl[3], uv[3], ref[3], orn[3], winco[3], sticky[3], vcol[4], rad[3]; float refcol[4], displace[3]; float strand, tang[3], stress, winspeed[4]; Index: source/blender/render/intern/source/shadeinput.c =================================================================== RCS file: /cvsroot/bf-blender/blender/source/blender/render/intern/source/shadeinput.c,v retrieving revision 1.6 diff -p -u -r1.6 shadeinput.c --- source/blender/render/intern/source/shadeinput.c 6 Dec 2006 15:48:40 -0000 1.6 +++ source/blender/render/intern/source/shadeinput.c 6 Dec 2006 16:13:17 -0000 @@ -645,11 +645,14 @@ void shade_input_set_shade_texco(ShadeIn shi->vcol[0]= (l*((float)cp3[3]) - u*((float)cp1[3]) - v*((float)cp2[3]))/255.0f; shi->vcol[1]= (l*((float)cp3[2]) - u*((float)cp1[2]) - v*((float)cp2[2]))/255.0f; shi->vcol[2]= (l*((float)cp3[1]) - u*((float)cp1[1]) - v*((float)cp2[1]))/255.0f; + shi->vcol[3]= (l*((float)cp3[0]) - u*((float)cp1[0]) - v*((float)cp2[0]))/255.0f; + } else { shi->vcol[0]= 0.0f; shi->vcol[1]= 0.0f; shi->vcol[2]= 0.0f; + shi->vcol[3]= 0.0f; } } if(vlr->tface) { @@ -685,6 +688,7 @@ void shade_input_set_shade_texco(ShadeIn shi->vcol[0]= 1.0f; shi->vcol[1]= 1.0f; shi->vcol[2]= 1.0f; + shi->vcol[3]= 1.0f; } if(vlr->tface) render_realtime_texture(shi); } @@ -698,6 +702,7 @@ void shade_input_set_shade_texco(ShadeIn shi->vcol[0]= 1.0f; shi->vcol[1]= 1.0f; shi->vcol[2]= 1.0f; + shi->vcol[3]= 1.0f; } } } Index: source/blender/render/intern/source/shadeoutput.c =================================================================== RCS file: /cvsroot/bf-blender/blender/source/blender/render/intern/source/shadeoutput.c,v retrieving revision 1.3 diff -p -u -r1.3 shadeoutput.c --- source/blender/render/intern/source/shadeoutput.c 6 Dec 2006 11:17:34 -0000 1.3 +++ source/blender/render/intern/source/shadeoutput.c 6 Dec 2006 16:13:18 -0000 @@ -805,6 +805,7 @@ void shade_color(ShadeInput *shi, ShadeR shi->r= shi->vcol[0]; shi->g= shi->vcol[1]; shi->b= shi->vcol[2]; + shi->alpha= shi->vcol[3]; } if(ma->texco) { @@ -812,6 +813,7 @@ void shade_color(ShadeInput *shi, ShadeR shi->r= shi->vcol[0]; shi->g= shi->vcol[1]; shi->b= shi->vcol[2]; + shi->alpha= shi->vcol[3]; } do_material_tex(shi); } @@ -1414,6 +1416,7 @@ void shade_lamp_loop(ShadeInput *shi, Sh shi->r= shi->vcol[0]; shi->g= shi->vcol[1]; shi->b= shi->vcol[2]; + shi->alpha= shi->vcol[3]; } if(ma->texco) do_material_tex(shi); Index: source/blender/render/intern/source/texture.c =================================================================== RCS file: /cvsroot/bf-blender/blender/source/blender/render/intern/source/texture.c,v retrieving revision 1.76 diff -p -u -r1.76 texture.c --- source/blender/render/intern/source/texture.c 5 Dec 2006 16:43:01 -0000 1.76 +++ source/blender/render/intern/source/texture.c 6 Dec 2006 16:13:18 -0000 @@ -2487,6 +2487,7 @@ void render_realtime_texture(ShadeInput shi->vcol[0]*= texr.tr; shi->vcol[1]*= texr.tg; shi->vcol[2]*= texr.tb; + shi->vcol[2]*= texr.ta; } }