bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Cycles:

Browse Source 
* Fix for [#33909]. If "Progressive" checkbox was disabled but device was GPU, it still used the amount of "aa_samples" instead of "samples"
This commit is contained in:
Thomas Dinges 2013-01-17 19:52:59 +00:00
parent 9e8c509213
commit 61ce87e741
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
intern/cycles/blender/blender_sync.cpp
View 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;
}