diff options
| author | Thomas Dinges <blender@dingto.org> | 2014-01-07 18:55:01 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2014-01-07 18:55:32 +0400 |
| commit | 073be286b4e8c7bfdb04550f3de23cef701b8b75 (patch) | |
| tree | 4cb3a9fb5054457d4ad9a4b94ad4eef8fc202f04 | |
| parent | 7b0a46b1ff4409a599751392329341c161c7e3c0 (diff) | |
Cycles: Update Integrator Presets and Total Samples info for latest changes.
| -rw-r--r-- | intern/cycles/blender/addon/presets.py | 1 | ||||
| -rw-r--r-- | intern/cycles/blender/addon/ui.py | 6 | ||||
| -rw-r--r-- | release/scripts/presets/cycles/sampling/final.py | 5 | ||||
| -rw-r--r-- | release/scripts/presets/cycles/sampling/preview.py | 5 |
4 files changed, 11 insertions, 6 deletions
diff --git a/intern/cycles/blender/addon/presets.py b/intern/cycles/blender/addon/presets.py index 66ec3a3a47a..9991fdb8e3b 100644 --- a/intern/cycles/blender/addon/presets.py +++ b/intern/cycles/blender/addon/presets.py @@ -65,6 +65,7 @@ class AddPresetSampling(AddPresetBase, Operator): "cycles.ao_samples", "cycles.mesh_light_samples", "cycles.subsurface_samples", + "cycles.volume_samples", "cycles.no_caustics", "cycles.blur_glossy", "cycles.use_square_samples", diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py index d5f14473230..0b107de58a9 100644 --- a/intern/cycles/blender/addon/ui.py +++ b/intern/cycles/blender/addon/ui.py @@ -64,6 +64,7 @@ def draw_samples_info(layout, cscene): ao = cscene.ao_samples ml = cscene.mesh_light_samples sss = cscene.subsurface_samples + vol = cscene.volume_samples if cscene.use_square_samples: aa = aa * aa @@ -73,6 +74,7 @@ def draw_samples_info(layout, cscene): ao = ao * ao ml = ml * ml sss = sss * sss + vol = vol * vol # Draw interface # Do not draw for progressive, when Square Samples are disabled @@ -87,8 +89,8 @@ def draw_samples_info(layout, cscene): col.label("%s AA, %s Diffuse, %s Glossy, %s Transmission" % (aa, d * aa, g * aa, t * aa)) col.separator() - col.label("%s AO, %s Mesh Light, %s Subsurface" % - (ao * aa, ml * aa, sss * aa)) + col.label("%s AO, %s Mesh Light, %s Subsurface, %s Volume" % + (ao * aa, ml * aa, sss * aa, vol * aa)) class CyclesRender_PT_sampling(CyclesButtonsPanel, Panel): diff --git a/release/scripts/presets/cycles/sampling/final.py b/release/scripts/presets/cycles/sampling/final.py index 2ee429188be..d03423b6c2e 100644 --- a/release/scripts/presets/cycles/sampling/final.py +++ b/release/scripts/presets/cycles/sampling/final.py @@ -3,11 +3,11 @@ cycles = bpy.context.scene.cycles cycles.use_square_samples = True -# Progressive +# Path Trace cycles.samples = 24 cycles.preview_samples = 12 -# Non-Progressive +# Branched Path Trace cycles.aa_samples = 8 cycles.preview_aa_samples = 4 @@ -17,3 +17,4 @@ cycles.transmission_samples = 2 cycles.ao_samples = 1 cycles.mesh_light_samples = 2 cycles.subsurface_samples = 2 +cycles.volume_samples = 2 diff --git a/release/scripts/presets/cycles/sampling/preview.py b/release/scripts/presets/cycles/sampling/preview.py index c7af6c83777..5f071c7474d 100644 --- a/release/scripts/presets/cycles/sampling/preview.py +++ b/release/scripts/presets/cycles/sampling/preview.py @@ -3,11 +3,11 @@ cycles = bpy.context.scene.cycles cycles.use_square_samples = True -# Progressive +# Path Trace cycles.samples = 12 cycles.preview_samples = 6 -# Non-Progressive +# Branched Path Trace cycles.aa_samples = 4 cycles.preview_aa_samples = 2 @@ -17,3 +17,4 @@ cycles.transmission_samples = 2 cycles.ao_samples = 1 cycles.mesh_light_samples = 2 cycles.subsurface_samples = 2 +cycles.volume_samples = 2 |