diff options
| author | Miika Hamalainen <blender@miikah.org> | 2011-12-31 14:46:21 +0400 |
|---|---|---|
| committer | Miika Hamalainen <blender@miikah.org> | 2011-12-31 14:46:21 +0400 |
| commit | 6c10080d241abfb489d7ae46c8720948278d1bf7 (patch) | |
| tree | f7e8ed33e167e378025d6e461367530a3dd80249 /source/blender/render | |
| parent | 0f2f2fe1a88a12ba5159557f42f0a584f6630c57 (diff) | |
Fix: Material "Vertex Color Light" option didn't apply vertex alpha.
Diffstat (limited to 'source/blender/render')
| -rw-r--r-- | source/blender/render/intern/source/shadeoutput.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/render/intern/source/shadeoutput.c b/source/blender/render/intern/source/shadeoutput.c index b99bab04b10..9cb30c2ba1a 100644 --- a/source/blender/render/intern/source/shadeoutput.c +++ b/source/blender/render/intern/source/shadeoutput.c @@ -1712,9 +1712,9 @@ void shade_lamp_loop(ShadeInput *shi, ShadeResult *shr) } if( (ma->mode & (MA_VERTEXCOL|MA_VERTEXCOLP))== MA_VERTEXCOL ) { // vertexcolor light - shr->emit[0]= shi->r*(shi->emit+shi->vcol[0]); - shr->emit[1]= shi->g*(shi->emit+shi->vcol[1]); - shr->emit[2]= shi->b*(shi->emit+shi->vcol[2]); + shr->emit[0]= shi->r*(shi->emit+shi->vcol[0]*shi->vcol[3]); + shr->emit[1]= shi->g*(shi->emit+shi->vcol[1]*shi->vcol[3]); + shr->emit[2]= shi->b*(shi->emit+shi->vcol[2]*shi->vcol[3]); } else { shr->emit[0]= shi->r*shi->emit; |