Cycles:
authorThomas Dinges <blender@dingto.org>
Thu, 17 Jan 2013 19:52:59 +0000 (19:52 +0000)
committerThomas Dinges <blender@dingto.org>
Thu, 17 Jan 2013 19:52:59 +0000 (19:52 +0000)
* Fix for [#33909]. If "Progressive" checkbox was disabled but device was GPU, it still used the amount of "aa_samples" instead of "samples"

intern/cycles/blender/blender_sync.cpp

index a2a8c23404f1ea0bb4149938664ca002791990b7..7ad663b7e26d2881e23a6496dc7ed471cc2e9385 100644 (file)
@@ -359,22 +359,22 @@ SessionParams BlenderSync::get_session_params(BL::RenderEngine b_engine, BL::Use
        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;
                }