[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53885] trunk/blender/intern/cycles/ blender/blender_sync.cpp: Cycles:

[Thomas Dinges]

Revision: 53885
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53885
Author:   dingto
Date:     2013-01-17 19:52:59 +0000 (Thu, 17 Jan 2013)
Log Message:
-----------
Cycles:
* Fix for [#33909]. If "Progressive" checkbox was disabled but device was GPU, it still used the amount of "aa_samples" instead of "samples"

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

Modified: trunk/blender/intern/cycles/blender/blender_sync.cpp
===================================================================
--- trunk/blender/intern/cycles/blender/blender_sync.cpp	2013-01-17 19:19:02 UTC (rev 53884)
+++ trunk/blender/intern/cycles/blender/blender_sync.cpp	2013-01-17 19:52:59 UTC (rev 53885)
@@ -359,22 +359,22 @@
 	params.background = background;
 
 	/* samples */
-	if(get_boolean(cscene, "progressive")) {
+	if(get_boolean(cscene, "progressive") == 0 && params.device.type == DEVICE_CPU){
 		if(background) {
-			params.samples = get_int(cscene, "samples");
+			params.samples = get_int(cscene, "aa_samples");
 		}
 		else {
-			params.samples = get_int(cscene, "preview_samples");
+			params.samples = get_int(cscene, "preview_aa_samples");
 			if(params.samples == 0)
 				params.samples = INT_MAX;
 		}
 	}
 	else {
 		if(background) {
-			params.samples = get_int(cscene, "aa_samples");
+			params.samples = get_int(cscene, "samples");
 		}
 		else {
-			params.samples = get_int(cscene, "preview_aa_samples");
+			params.samples = get_int(cscene, "preview_samples");
 			if(params.samples == 0)
 				params.samples = INT_MAX;
 		}