Merged changes in the trunk up to revision 51718.
[blender.git] / source / blender / render / intern / source / shadeoutput.c
index 93743dedd3c39f015b1841b836dbf683b52802c2..ea155f944e4d89a89534d002767a8cc6abd7d553 100644 (file)
@@ -1708,6 +1708,12 @@ void shade_lamp_loop(ShadeInput *shi, ShadeResult *shr)
                        if (ma->mode & (MA_FACETEXTURE_ALPHA))
                                shi->alpha= shi->vcol[3];
                }
+               else if (ma->vcol_alpha) {
+                       shi->r= shi->vcol[0];
+                       shi->g= shi->vcol[1];
+                       shi->b= shi->vcol[2];
+                       shi->alpha= shi->vcol[3];
+               }
                else if (ma->mode & (MA_VERTEXCOLP)) {
                        float neg_alpha = 1.0f - shi->vcol[3];
                        shi->r= shi->r*neg_alpha + shi->vcol[0]*shi->vcol[3];