archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

svn merge ^/trunk/blender -r43009:43033

Browse Source
This commit is contained in:
Campbell Barton
2011-12-31 12:03:36 +00:00
parent 81f5c9ed9b bac6757ea0
commit 78a4e24614
52 changed files with 15989 additions and 6384 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/render/intern/source/shadeoutput.c
View File

@@ -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;