Merged changes in the trunk up to revision 39896.
[blender.git] / source / blender / render / intern / source / shadeoutput.c
index 30632586b04ac608e827f24282a739839ea8b16c..201bec541a8732a3b42bf49233e1ab39dca74633 100644 (file)
@@ -1653,7 +1653,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->mode & MA_TRANSP) ? shi->vcol[3] : 1.0f;
                }
                if(ma->texco){