[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13259] trunk/blender/source/blender/ render/intern/source/strand.c:
Brecht Van Lommel
brechtvanlommel at pandora.be
Wed Jan 16 15:25:59 CET 2008
Revision: 13259
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13259
Author: blendix
Date: 2008-01-16 15:25:59 +0100 (Wed, 16 Jan 2008)
Log Message:
-----------
Bugfix: strands didn't respect renderlayers.
Modified Paths:
--------------
trunk/blender/source/blender/render/intern/source/strand.c
Modified: trunk/blender/source/blender/render/intern/source/strand.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/strand.c 2008-01-16 11:43:22 UTC (rev 13258)
+++ trunk/blender/source/blender/render/intern/source/strand.c 2008-01-16 14:25:59 UTC (rev 13259)
@@ -59,7 +59,7 @@
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 @@
if(re->test_break())
break;
+ if(!(strand->buffer->lay & rl->lay))
+ continue;
+
#if 0
if(strand->clip)
continue;
More information about the Bf-blender-cvs
mailing list