diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-01-16 17:25:59 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-01-16 17:25:59 +0300 |
| commit | 1faba3d82d2a7f7d066608a29658382f764fd583 (patch) | |
| tree | cc7d6b19eb019ad147233c9eb98f5e0c1dab78d0 /source | |
| parent | 7c1961234b9e6d872c0abb9ae548f4a6922a2b70 (diff) | |
Bugfix: strands didn't respect renderlayers.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/render/intern/source/strand.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/render/intern/source/strand.c b/source/blender/render/intern/source/strand.c index 3ad9bb66559..692c86a68cf 100644 --- a/source/blender/render/intern/source/strand.c +++ b/source/blender/render/intern/source/strand.c @@ -59,7 +59,7 @@ void merge_transp_passes(RenderLayer *rl, ShadeResult *shr); void add_transp_passes(RenderLayer *rl, int offset, ShadeResult *shr, float alpha); void hoco_to_zco(ZSpan *zspan, float *zco, float *hoco); void zspan_scanconvert_strand(ZSpan *zspan, void *handle, float *v1, float *v2, float *v3, void (*func)(void *, int, int, float, float, float) ); -void zbufsinglewire(ZSpan *zspan, ObjectRen *obr, int zvlnr, float *ho1, float *ho2); +void zbufsinglewire(ZSpan *zspan, int obi, int zvlnr, float *ho1, float *ho2); int addtosamp_shr(ShadeResult *samp_shr, ShadeSample *ssamp, int addpassflag); void add_transp_speed(RenderLayer *rl, int offset, float *speed, float alpha, long *rdrect); void reset_sky_speedvectors(RenderPart *pa, RenderLayer *rl, float *rectf); @@ -1057,6 +1057,9 @@ unsigned short *zbuffer_strands_shade(Render *re, RenderPart *pa, RenderLayer *r if(re->test_break()) break; + if(!(strand->buffer->lay & rl->lay)) + continue; + #if 0 if(strand->clip) continue; |