diff options
Diffstat (limited to 'intern/cycles/blender/blender_sync.cpp')
| -rw-r--r-- | intern/cycles/blender/blender_sync.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/intern/cycles/blender/blender_sync.cpp b/intern/cycles/blender/blender_sync.cpp index a2a8c23404f..7ad663b7e26 100644 --- a/intern/cycles/blender/blender_sync.cpp +++ b/intern/cycles/blender/blender_sync.cpp @@ -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; } |