[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23522] branches/blender2.4/source/blender /render/intern/source/rayshade.c: svn merge https://svn.blender.org/svnroot /bf-blender/trunk/blender -r23427:23428

[Campbell Barton]

Revision: 23522
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23522
Author:   campbellbarton
Date:     2009-09-28 11:59:21 +0200 (Mon, 28 Sep 2009)

Log Message:
-----------
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r23427:23428

[#8358] Performance regression with raytraced refraction (from Matt Ebb)

Modified Paths:
--------------
    branches/blender2.4/source/blender/render/intern/source/rayshade.c

Modified: branches/blender2.4/source/blender/render/intern/source/rayshade.c
===================================================================
--- branches/blender2.4/source/blender/render/intern/source/rayshade.c	2009-09-28 09:06:28 UTC (rev 23521)
+++ branches/blender2.4/source/blender/render/intern/source/rayshade.c	2009-09-28 09:59:21 UTC (rev 23522)
@@ -1868,7 +1868,8 @@
 		else max_samples = 1;
 	} else {
 		if (do_soft) max_samples = lar->ray_totsamp;
-		else max_samples = (R.osa > 4)?R.osa:5;
+		else if (shi->depth == 0) max_samples = (R.osa > 4)?R.osa:5;
+		else max_samples = 1;
 	}
 	
 	ray_shadow_jittered_coords(shi, max_samples, jitco, &totjitco);