[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29997] branches/render25/source/blender/ render/intern/source/shadeoutput.c: Render Branch: fix ray shadow samples not being taken into account correctly.
Brecht Van Lommel
brecht at blender.org
Mon Jul 5 19:57:31 CEST 2010
Revision: 29997
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29997
Author: blendix
Date: 2010-07-05 19:57:30 +0200 (Mon, 05 Jul 2010)
Log Message:
-----------
Render Branch: fix ray shadow samples not being taken into account correctly.
Modified Paths:
--------------
branches/render25/source/blender/render/intern/source/shadeoutput.c
Modified: branches/render25/source/blender/render/intern/source/shadeoutput.c
===================================================================
--- branches/render25/source/blender/render/intern/source/shadeoutput.c 2010-07-05 17:46:45 UTC (rev 29996)
+++ branches/render25/source/blender/render/intern/source/shadeoutput.c 2010-07-05 17:57:30 UTC (rev 29997)
@@ -502,12 +502,12 @@
if(shi->shading.depth)
return 1;
- if(tot <= 1)
- return 1;
- else if(shade_full_osa(re, shi))
+ if(shade_full_osa(re, shi))
+ /* for full osa, fewer samples per shade, but at least one */
return tot/re->params.osa + 1;
else
- return tot;
+ /* in other cases, at least as many samples as AA samples */
+ return MAX2(tot, (re->params.osa > 4)? re->params.osa: 5);
}
static void shade_lamp_multi(Render *re, LampRen *lar, ShadeInput *shi, ShadeResult *shr, int passflag)
@@ -593,7 +593,7 @@
float accumshdw[3], lainf[3], lv[3];
int sample, totsample, totjitco= 0;
- totsample= (re->params.osa > 4)? re->params.osa: 5;
+ totsample= shade_lamp_tot_samples(re, lar, shi);
qsa= sampler_acquire(re, shi->shading.thread, SAMP_TYPE_HAMMERSLEY, totsample);
shade_jittered_coords(re, shi, totsample, jitco, &totjitco);
More information about the Bf-blender-cvs
mailing list