diff options
| author | Thomas Dinges <blender@dingto.org> | 2013-08-01 02:51:48 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2013-08-01 02:51:48 +0400 |
| commit | 702bf77b3490a6c74cf43236c5795b19d042f11b (patch) | |
| tree | f878f74507df5ed113dd3c5ee8a1aff1f31d7615 /intern/cycles/blender/blender_sync.cpp | |
| parent | ac8e379a87b78ed96cc9dac5fe5b88e5bd4979f7 (diff) | |
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.
Diffstat (limited to 'intern/cycles/blender/blender_sync.cpp')
| -rw-r--r-- | intern/cycles/blender/blender_sync.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/intern/cycles/blender/blender_sync.cpp b/intern/cycles/blender/blender_sync.cpp index 11e2be5e0fb..d1d235ec41a 100644 --- a/intern/cycles/blender/blender_sync.cpp +++ b/intern/cycles/blender/blender_sync.cpp @@ -321,7 +321,7 @@ void BlenderSync::sync_render_layers(BL::SpaceView3D b_v3d, const char *layer) 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 @@ SessionParams BlenderSync::get_session_params(BL::RenderEngine b_engine, BL::Use 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; } |