diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-11-13 03:38:41 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-11-13 03:38:41 +0400 |
| commit | a26baa1580cef781e0c7f85290a499892f6f1016 (patch) | |
| tree | 0e59244f7de181672a51dfeea1791a08e307d9a7 | |
| parent | 0ca96e1eb1da42268c11c286c74e79ed31da2c37 (diff) | |
Restored the functionality of stroke transparency.
| -rw-r--r-- | source/blender/render/intern/source/shadeoutput.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/source/blender/render/intern/source/shadeoutput.c b/source/blender/render/intern/source/shadeoutput.c index 5182cf4d4b5..ad964a74b36 100644 --- a/source/blender/render/intern/source/shadeoutput.c +++ b/source/blender/render/intern/source/shadeoutput.c @@ -1665,9 +1665,15 @@ 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)) || 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]; |