Index: source/blender/render/intern/source/rendercore.c =================================================================== RCS file: /cvsroot/bf-blender/blender/source/blender/render/intern/source/rendercore.c,v retrieving revision 1.189 diff -p -u -r1.189 rendercore.c --- source/blender/render/intern/source/rendercore.c 29 Nov 2006 17:01:08 -0000 1.189 +++ source/blender/render/intern/source/rendercore.c 5 Dec 2006 19:22:47 -0000 @@ -1078,6 +1078,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) { @@ -1085,6 +1086,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); } @@ -1582,6 +1584,7 @@ static void shade_lamp_loop_pass(ShadeIn 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); @@ -1843,6 +1846,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]; } /* envmap hack, always reset */ @@ -1853,6 +1857,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]; } do_material_tex(shi); } @@ -2245,6 +2250,7 @@ void shade_input_set_coords(ShadeInput * shi->vcol[0]= (l*((float)cp3[3]) - u*((float)cp1[3]) - v*((float)cp2[3]))/255.0; shi->vcol[1]= (l*((float)cp3[2]) - u*((float)cp1[2]) - v*((float)cp2[2]))/255.0; shi->vcol[2]= (l*((float)cp3[1]) - u*((float)cp1[1]) - v*((float)cp2[1]))/255.0; + shi->vcol[3]= (l*((float)cp3[0]) - u*((float)cp1[0]) - v*((float)cp2[0]))/255.0; } else { shi->vcol[0]= 0.0; 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.15 diff -p -u -r1.15 RE_shader_ext.h --- source/blender/render/extern/include/RE_shader_ext.h 22 Nov 2006 18:45:33 -0000 1.15 +++ source/blender/render/extern/include/RE_shader_ext.h 5 Dec 2006 19:22:47 -0000 @@ -85,7 +85,7 @@ typedef struct ShadeInput int mode; /* 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 vn[3], vno[3], facenor[3], view[3], refcol[4], displace[3]; float strand, tang[3], stress, winspeed[4];