diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-03-11 15:29:59 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-03-11 15:29:59 +0300 |
| commit | 7f6889a63b7bf3d24798fd70ddeb6f1ba0ddeb89 (patch) | |
| tree | b0cdd62fc425b25ad730379b9e5af94e297013a5 /source/blender/render/intern/source/shadeoutput.c | |
| parent | 51a8a60d96ac49c625787abd0406cf12cb2d3636 (diff) | |
Bugfix: render instancing didn't work correct with layer ipo's,
each instance should have it's own layer.
Diffstat (limited to 'source/blender/render/intern/source/shadeoutput.c')
| -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 a7dbec2e525..303511c3a5d 100644 --- a/source/blender/render/intern/source/shadeoutput.c +++ b/source/blender/render/intern/source/shadeoutput.c @@ -355,7 +355,7 @@ void renderspothalo(ShadeInput *shi, float *col, float alpha) if(lar->type==LA_SPOT && (lar->mode & LA_HALO) && lar->haint>0) { if(lar->mode & LA_LAYER) - if(shi->vlr && (lar->lay & shi->obr->lay)==0) + if(shi->vlr && (lar->lay & shi->obi->lay)==0) continue; if((lar->lay & shi->lay)==0) continue; @@ -1463,7 +1463,7 @@ static void shade_lamp_loop_only_shadow(ShadeInput *shi, ShadeResult *shr) /* yafray: ignore shading by photonlights, not used in Blender */ if (lar->type==LA_YF_PHOTON) continue; - if(lar->mode & LA_LAYER) if((lar->lay & shi->obr->lay)==0) continue; + if(lar->mode & LA_LAYER) if((lar->lay & shi->obi->lay)==0) continue; if((lar->lay & shi->lay)==0) continue; if(lar->shb || (lar->mode & LA_SHAD_RAY)) { @@ -1601,7 +1601,7 @@ void shade_lamp_loop(ShadeInput *shi, ShadeResult *shr) if (lar->type==LA_YF_PHOTON) continue; /* test for lamp layer */ - if(lar->mode & LA_LAYER) if((lar->lay & shi->obr->lay)==0) continue; + if(lar->mode & LA_LAYER) if((lar->lay & shi->obi->lay)==0) continue; if((lar->lay & shi->lay)==0) continue; /* accumulates in shr->diff and shr->spec and shr->shad (diffuse with shadow!) */ |