Merged changes in the trunk up to revision 34193.
[blender.git] / source / blender / render / intern / source / shadeoutput.c
index 7993abc85a1b70ba5fb6eda6564558960c019d02..14af838d8260d89e84972d3cc1031525c147b91c 100644 (file)
@@ -1593,7 +1593,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)