kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Bugfix for crash in approximate AO pixel cache.

Browse Source
This commit is contained in:
Brecht Van Lommel 2008-01-19 19:33:32 +00:00
parent 2fa4ff4dac
commit 231840a99f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1641,7 +1641,7 @@ void cache_occ_samples(Render *re, RenderPart *pa, ShadeSample *ssamp)
/* compute a sample at every step pixels */ /* compute a sample at every step pixels */
for(y=pa->disprect.ymin; y<pa->disprect.ymax; y++) { for(y=pa->disprect.ymin; y<pa->disprect.ymax; y++) {
for(x=pa->disprect.xmin; x<pa->disprect.xmax; x++, ro++, rp++, rz++) { for(x=pa->disprect.xmin; x<pa->disprect.xmax; x++, ro++, rp++, rz++, sample++) {
if((((x - pa->disprect.xmin + step) % step) == 0 || x == pa->disprect.xmax-1) && (((y - pa->disprect.ymin + step) % step) == 0 || y == pa->disprect.ymax-1)) { if((((x - pa->disprect.xmin + step) % step) == 0 || x == pa->disprect.xmax-1) && (((y - pa->disprect.ymin + step) % step) == 0 || y == pa->disprect.ymax-1)) {
if(*rp) { if(*rp) {
ps.obi= *ro; ps.obi= *ro;
@ -1650,6 +1650,8 @@ void cache_occ_samples(Render *re, RenderPart *pa, ShadeSample *ssamp)
shade_samples_fill_with_ps(ssamp, &ps, x, y); shade_samples_fill_with_ps(ssamp, &ps, x, y);
shi= ssamp->shi; shi= ssamp->shi;
if(!shi->vlr)
continue;
onlyshadow= (shi->mat->mode & MA_ONLYSHADOW); onlyshadow= (shi->mat->mode & MA_ONLYSHADOW);
exclude.obi= shi->obi - re->objectinstance; exclude.obi= shi->obi - re->objectinstance;
@ -1669,8 +1671,6 @@ void cache_occ_samples(Render *re, RenderPart *pa, ShadeSample *ssamp)
if(re->test_break()) if(re->test_break())
break; break;
} }
sample++;
} }
} }
} }