From 702bf77b3490a6c74cf43236c5795b19d042f11b Mon Sep 17 00:00:00 2001 From: Thomas Dinges Date: Wed, 31 Jul 2013 22:51:48 +0000 Subject: [PATCH] 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. --- intern/cycles/blender/addon/ui.py | 4 +++- intern/cycles/blender/blender_sync.cpp | 5 ++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py index 1a17675cb71..411bd5b8b27 100644 --- a/intern/cycles/blender/addon/ui.py +++ b/intern/cycles/blender/addon/ui.py @@ -70,7 +70,9 @@ class CyclesRender_PT_sampling(CyclesButtonsPanel, Panel): sub = row.row() sub.active = (device_type == 'NONE' or cscene.device == 'CPU') sub.prop(cscene, "progressive") - row.prop(cscene, "squared_samples") + + if not cscene.progressive: + row.prop(cscene, "squared_samples") split = layout.split() 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; }