diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-12-31 16:03:36 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-12-31 16:03:36 +0400 |
| commit | 78a4e2461419f026d53e409cb75073ba5f47e1bb (patch) | |
| tree | 2847f536bee9b51a0d30f59baf6becc22a8acffd /source/blender/render/intern/source | |
| parent | 81f5c9ed9b8193864f1c6160aed9eef9338f0d27 (diff) | |
| parent | bac6757ea0b1c873b8dd8221592ea95eed8d5bac (diff) | |
svn merge ^/trunk/blender -r43009:43033
Diffstat (limited to 'source/blender/render/intern/source')
| -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; |