archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

- Fix for approximate AO pixel cache crash.

Browse Source 
- Fix in FSA pass sample adding (more fixes to come).
This commit is contained in:
Brecht Van Lommel
2008-01-28 22:34:14 +00:00
parent 9b0c2efeed
commit db9f702db9
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/render/intern/source/occlusion.c
View File

@@ -1581,7 +1581,7 @@ void cache_occ_samples(Render *re, RenderPart *pa, ShadeSample *ssamp)
sample= cache->sample; sample= cache->sample;
ps.next= NULL; ps.next= NULL;
ps.mask= 0xFFFF; ps.mask= (1<<re->osa);
ro= pa->recto; ro= pa->recto;
rp= pa->rectp; rp= pa->rectp;

8
source/blender/render/intern/source/zbuf.c
View File

@@ -3637,9 +3637,9 @@ static void shade_strand_samples(StrandShadeCache *cache, ShadeSample *ssamp, in
sseg.v[2]= svert+1; sseg.v[2]= svert+1;
sseg.v[3]= (row->segment < sseg.strand->totvert-2)? svert+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); strand_shade_segment(&R, cache, &sseg, ssamp, row->v, row->u, addpassflag);
ssamp->shi[0].mask= row->mask; ssamp->shi[0].mask= row->mask;
ssamp->tot= 1;
} }
static void unref_strand_samples(StrandShadeCache *cache, ZTranspRow *row, int totface) static void unref_strand_samples(StrandShadeCache *cache, ZTranspRow *row, int totface)
@@ -3765,7 +3765,7 @@ static void addvecmul(float *v1, float *v2, float fac)
v1[2]= v1[2]+fac*v2[2]; 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; int a, sample, osa = (R.osa? R.osa: 1), retval = osa;
@@ -3825,7 +3825,7 @@ int addtosamp_shr(ShadeResult *samp_shr, ShadeSample *ssamp, int addpassflag)
return retval; 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 */ /* 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 */ /* for all pixels with alpha zero, we re-initialize speed again then */
@@ -4080,7 +4080,7 @@ unsigned short *zbuffer_transp_shade(RenderPart *pa, RenderLayer *rl, float *pas
addAlphaOverFloat(rl->rectf + 4*od, samp_shr[a].combined); 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) if(addpassflag & SCE_PASS_VECTOR)
add_transp_speed(rl, od, samp_shr[a].winspeed, alpha, rdrect); add_transp_speed(rl, od, samp_shr[a].winspeed, alpha, rdrect);
} }