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

[Thomas Dinges]

Revision: 58798
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58798
Author:   dingto
Date:     2013-07-31 22:51:48 +0000 (Wed, 31 Jul 2013)
Log Message:
-----------
Cycles / Squared Samples:
* After some feedback decided to remove this option from the Progressive integrator, it only makes sense for Non-Progressive where we have different values for the sample types. 

Modified Paths:
--------------
    trunk/blender/intern/cycles/blender/addon/ui.py
    trunk/blender/intern/cycles/blender/blender_sync.cpp

Modified: trunk/blender/intern/cycles/blender/addon/ui.py
===================================================================
--- trunk/blender/intern/cycles/blender/addon/ui.py	2013-07-31 22:39:17 UTC (rev 58797)
+++ trunk/blender/intern/cycles/blender/addon/ui.py	2013-07-31 22:51:48 UTC (rev 58798)
@@ -70,8 +70,10 @@
         sub = row.row()
         sub.active = (device_type == 'NONE' or cscene.device == 'CPU')
         sub.prop(cscene, "progressive")
-        row.prop(cscene, "squared_samples")
         
+        if not cscene.progressive:
+            row.prop(cscene, "squared_samples")
+        
         split = layout.split()
         
         col = split.column()

Modified: trunk/blender/intern/cycles/blender/blender_sync.cpp
===================================================================
--- trunk/blender/intern/cycles/blender/blender_sync.cpp	2013-07-31 22:39:17 UTC (rev 58797)
+++ trunk/blender/intern/cycles/blender/blender_sync.cpp	2013-07-31 22:51:48 UTC (rev 58798)
@@ -321,7 +321,7 @@
 			render_layer.bound_samples = (use_layer_samples == 1);
 			if(use_layer_samples != 2) {
 				int samples = b_rlay->samples();
-				if(get_boolean(cscene, "squared_samples"))
+				if(get_boolean(cscene, "squared_samples") && !(get_boolean(cscene, "progressive")))
 					render_layer.samples = samples * samples;
 				else
 					render_layer.samples = samples;
@@ -414,10 +414,9 @@
 	int preview_samples = get_int(cscene, "preview_samples");
 	int preview_aa_samples = get_int(cscene, "preview_aa_samples");
 	
+	/* Squared samples for Non-Progressive only */
 	if(get_boolean(cscene, "squared_samples")) {
-		samples = samples * samples;
 		aa_samples = aa_samples * aa_samples;
-		preview_samples = preview_samples * preview_samples;
 		preview_aa_samples = preview_aa_samples * preview_aa_samples;
 	}