[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41773] branches/soc-2008-mxcurioni/source /blender/render/intern/source/shadeoutput.c: Restored the functionality of stroke transparency.

[Tamito Kajiyama]

Revision: 41773
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41773
Author:   kjym3
Date:     2011-11-12 23:38:41 +0000 (Sat, 12 Nov 2011)
Log Message:
-----------
Restored the functionality of stroke transparency.

Modified Paths:
--------------
    
branches/soc-2008-mxcurioni/source/blender/render/intern/source/shadeoutput.c

Modified: 
branches/soc-2008-mxcurioni/source/blender/render/intern/source/shadeoutput.c
===================================================================
--- 
branches/soc-2008-mxcurioni/source/blender/render/intern/source/shadeoutput.c   
    2011-11-12 23:12:30 UTC (rev 41772)
+++ 
branches/soc-2008-mxcurioni/source/blender/render/intern/source/shadeoutput.c   
    2011-11-12 23:38:41 UTC (rev 41773)
@@ -1665,9 +1665,15 @@
                        shi->r= shi->vcol[0];
                        shi->g= shi->vcol[1];
                        shi->b= shi->vcol[2];
-                       if((ma->mode & (MA_FACETEXTURE_ALPHA)) || 
ma->vcol_alpha)
+                       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];

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs