sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix: blender internal transparent shadows were not influenced by object color alpha.

Browse Source
This commit is contained in:
Brecht Van Lommel 2013-06-28 15:00:05 +00:00
parent a7e7b69a65
commit e5f23c00c1
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -924,6 +924,19 @@ void shade_color(ShadeInput *shi, ShadeResult *shr)
shr->diff[1]= shi->g; shr->diff[1]= shi->g;
shr->diff[2]= shi->b; shr->diff[2]= shi->b;
shr->alpha= shi->alpha; shr->alpha= shi->alpha;
/* modulate by the object color */
if ((ma->shade_flag & MA_OBCOLOR) && shi->obr->ob) {
float obcol[4];
copy_v4_v4(obcol, shi->obr->ob->col);
CLAMP(obcol[3], 0.0f, 1.0f);
shr->diff[0] *= obcol[0];
shr->diff[1] *= obcol[1];
shr->diff[2] *= obcol[2];
if (shi->mode & MA_TRANSP) shr->alpha *= obcol[3];
}
} }
/* ramp for at end of shade */ /* ramp for at end of shade */