Merged changes in the trunk up to revision 36408.
[blender.git] / source / blender / render / intern / source / shadeoutput.c
index 5a5de938e43da29337b51d8b878d942cc1ff122a..b0a7fdd1b362c98f762c1fc1d5d377045f41852c 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){