[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59448] trunk/blender/intern/cycles: Cycles:

[Thomas Dinges]

Revision: 59448
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59448
Author:   dingto
Date:     2013-08-24 00:27:20 +0000 (Sat, 24 Aug 2013)
Log Message:
-----------
Cycles:
* Fix Cycles using wrong AA sample values, after integrator renaming. 

Modified Paths:
--------------
    trunk/blender/intern/cycles/blender/blender_sync.cpp
    trunk/blender/intern/cycles/kernel/kernel_subsurface.h

Modified: trunk/blender/intern/cycles/blender/blender_sync.cpp
===================================================================
--- trunk/blender/intern/cycles/blender/blender_sync.cpp	2013-08-23 23:04:50 UTC (rev 59447)
+++ trunk/blender/intern/cycles/blender/blender_sync.cpp	2013-08-24 00:27:20 UTC (rev 59448)
@@ -420,7 +420,7 @@
 		preview_samples = preview_samples * preview_samples;
 	}
 
-	if(get_int(cscene, "progressive") == 0) {
+	if(get_enum(cscene, "progressive") == 0) {
 		if(background) {
 			params.samples = aa_samples;
 		}

Modified: trunk/blender/intern/cycles/kernel/kernel_subsurface.h
===================================================================
--- trunk/blender/intern/cycles/kernel/kernel_subsurface.h	2013-08-23 23:04:50 UTC (rev 59447)
+++ trunk/blender/intern/cycles/kernel/kernel_subsurface.h	2013-08-24 00:27:20 UTC (rev 59448)
@@ -111,8 +111,8 @@
 		sc = &sd->closure[i];
 		
 		if(CLOSURE_IS_BSSRDF(sc->type)) {
-			/* in case of non-progressive integrate we sample all bssrdf's once,
-			 * for progressive we pick one, so adjust pdf for that */
+			/* in case of branched path integrate we sample all bssrdf's once,
+			 * for path trace we pick one, so adjust pdf for that */
 			float sample_weight = (all)? 1.0f: sc->sample_weight * sample_weight_inv;
 
 			/* compute pdf */
@@ -464,8 +464,8 @@
 	float inv_pdf_sum;
 	
 	if(pdf_sum > 0.0f) {
-		/* in case of non-progressive integrate we sample all bssrdf's once,
-		 * for progressive we pick one, so adjust pdf for that */
+		/* in case of branched path integrate we sample all bssrdf's once,
+		 * for path trace we pick one, so adjust pdf for that */
 		if(all)
 			inv_pdf_sum = 1.0f/pdf_sum;
 		else