[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13442] trunk/blender/source/blender/ render/intern/source:

[Brecht Van Lommel]

Revision: 13442
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13442
Author:   blendix
Date:     2008-01-28 23:34:14 +0100 (Mon, 28 Jan 2008)

Log Message:
-----------

- Fix for approximate AO pixel cache crash.
- Fix in FSA pass sample adding (more fixes to come).

Modified Paths:
--------------
    trunk/blender/source/blender/render/intern/source/occlusion.c
    trunk/blender/source/blender/render/intern/source/zbuf.c

Modified: trunk/blender/source/blender/render/intern/source/occlusion.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/occlusion.c	2008-01-28 21:28:32 UTC (rev 13441)
+++ trunk/blender/source/blender/render/intern/source/occlusion.c	2008-01-28 22:34:14 UTC (rev 13442)
@@ -1581,7 +1581,7 @@
 	sample= cache->sample;
 
 	ps.next= NULL;
-	ps.mask= 0xFFFF;
+	ps.mask= (1<<re->osa);
 
 	ro= pa->recto;
 	rp= pa->rectp;

Modified: trunk/blender/source/blender/render/intern/source/zbuf.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/zbuf.c	2008-01-28 21:28:32 UTC (rev 13441)
+++ trunk/blender/source/blender/render/intern/source/zbuf.c	2008-01-28 22:34:14 UTC (rev 13442)
@@ -3637,9 +3637,9 @@
 	sseg.v[2]= svert+1;
 	sseg.v[3]= (row->segment < sseg.strand->totvert-2)? svert+2: svert+1;
 
+	ssamp->tot= 1;
 	strand_shade_segment(&R, cache, &sseg, ssamp, row->v, row->u, addpassflag);
 	ssamp->shi[0].mask= row->mask;
-	ssamp->tot= 1;
 }
 
 static void unref_strand_samples(StrandShadeCache *cache, ZTranspRow *row, int totface)
@@ -3765,7 +3765,7 @@
 	v1[2]= v1[2]+fac*v2[2];
 }
 
-int addtosamp_shr(ShadeResult *samp_shr, ShadeSample *ssamp, int addpassflag)
+static int addtosamp_shr(ShadeResult *samp_shr, ShadeSample *ssamp, int addpassflag)
 {
 	int a, sample, osa = (R.osa? R.osa: 1), retval = osa;
 	
@@ -3825,7 +3825,7 @@
 	return retval;
 }
 
-void reset_sky_speedvectors(RenderPart *pa, RenderLayer *rl, float *rectf)
+static void reset_sky_speedvectors(RenderPart *pa, RenderLayer *rl, float *rectf)
 {
 	/* speed vector exception... if solid render was done, sky pixels are set to zero already */
 	/* for all pixels with alpha zero, we re-initialize speed again then */
@@ -4080,7 +4080,7 @@
 								
 								addAlphaOverFloat(rl->rectf + 4*od, samp_shr[a].combined);
 				
-								add_transp_passes(rl, od, samp_shr, alpha);
+								add_transp_passes(rl, od, &samp_shr[a], alpha);
 								if(addpassflag & SCE_PASS_VECTOR)
 									add_transp_speed(rl, od, samp_shr[a].winspeed, alpha, rdrect);
 							}