Merged changes in the trunk up to revision 44039.
[blender-staging.git] / source / blender / render / intern / source / shadeoutput.c
index 9aac7aae53e70671f4e0fd72fb811c626048c8ac..62df221deeb347edbce543b6192325a4ad9a1f89 100644 (file)
@@ -1674,6 +1674,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];