Merged changes in the trunk up to revision 30952.
[blender-staging.git] / source / blender / render / intern / source / shadeoutput.c
index 81de553b20909361860cc06b2259980198fa5f7b..00eb6e3d17d8324f0e307afbe48770d1e23d2d80 100644 (file)
@@ -1590,7 +1590,7 @@ void shade_lamp_loop(ShadeInput *shi, ShadeResult *shr)
                        shi->r= shi->vcol[0];
                        shi->g= shi->vcol[1];
                        shi->b= shi->vcol[2];
-                       if(ma->mode & (MA_FACETEXTURE_ALPHA))
+                       if((ma->mode & (MA_FACETEXTURE_ALPHA)) || ma->vcol_alpha)
                                shi->alpha= shi->vcol[3];
                }
                if(ma->texco)