archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cycles: Update Integrator Presets and Total Samples info for latest changes.

Browse Source
This commit is contained in:
Thomas Dinges
2014-01-07 15:55:01 +01:00
parent 7b0a46b1ff
commit 073be286b4
4 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
intern/cycles/blender/addon/presets.py
View File

@@ -65,6 +65,7 @@ class AddPresetSampling(AddPresetBase, Operator):
"cycles.ao_samples", "cycles.ao_samples",
"cycles.mesh_light_samples", "cycles.mesh_light_samples",
"cycles.subsurface_samples", "cycles.subsurface_samples",
"cycles.volume_samples",
"cycles.no_caustics", "cycles.no_caustics",
"cycles.blur_glossy", "cycles.blur_glossy",
"cycles.use_square_samples", "cycles.use_square_samples",

6
intern/cycles/blender/addon/ui.py
View File

@@ -64,6 +64,7 @@ def draw_samples_info(layout, cscene):
ao = cscene.ao_samples ao = cscene.ao_samples
ml = cscene.mesh_light_samples ml = cscene.mesh_light_samples
sss = cscene.subsurface_samples sss = cscene.subsurface_samples
vol = cscene.volume_samples
if cscene.use_square_samples: if cscene.use_square_samples:
aa = aa * aa aa = aa * aa
@@ -73,6 +74,7 @@ def draw_samples_info(layout, cscene):
ao = ao * ao ao = ao * ao
ml = ml * ml ml = ml * ml
sss = sss * sss sss = sss * sss
vol = vol * vol
# Draw interface # Draw interface
# Do not draw for progressive, when Square Samples are disabled # 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" % col.label("%s AA, %s Diffuse, %s Glossy, %s Transmission" %
(aa, d * aa, g * aa, t * aa)) (aa, d * aa, g * aa, t * aa))
col.separator() col.separator()
col.label("%s AO, %s Mesh Light, %s Subsurface" % col.label("%s AO, %s Mesh Light, %s Subsurface, %s Volume" %
(ao * aa, ml * aa, sss * aa)) (ao * aa, ml * aa, sss * aa, vol * aa))
class CyclesRender_PT_sampling(CyclesButtonsPanel, Panel): class CyclesRender_PT_sampling(CyclesButtonsPanel, Panel):

5
release/scripts/presets/cycles/sampling/final.py
View File

@@ -3,11 +3,11 @@ cycles = bpy.context.scene.cycles
cycles.use_square_samples = True cycles.use_square_samples = True
# Progressive # Path Trace
cycles.samples = 24 cycles.samples = 24
cycles.preview_samples = 12 cycles.preview_samples = 12
# Non-Progressive # Branched Path Trace
cycles.aa_samples = 8 cycles.aa_samples = 8
cycles.preview_aa_samples = 4 cycles.preview_aa_samples = 4
@@ -17,3 +17,4 @@ cycles.transmission_samples = 2
cycles.ao_samples = 1 cycles.ao_samples = 1
cycles.mesh_light_samples = 2 cycles.mesh_light_samples = 2
cycles.subsurface_samples = 2 cycles.subsurface_samples = 2
cycles.volume_samples = 2

5
release/scripts/presets/cycles/sampling/preview.py
View File

@@ -3,11 +3,11 @@ cycles = bpy.context.scene.cycles
cycles.use_square_samples = True cycles.use_square_samples = True
# Progressive # Path Trace
cycles.samples = 12 cycles.samples = 12
cycles.preview_samples = 6 cycles.preview_samples = 6
# Non-Progressive # Branched Path Trace
cycles.aa_samples = 4 cycles.aa_samples = 4
cycles.preview_aa_samples = 2 cycles.preview_aa_samples = 2
@@ -17,3 +17,4 @@ cycles.transmission_samples = 2
cycles.ao_samples = 1 cycles.ao_samples = 1
cycles.mesh_light_samples = 2 cycles.mesh_light_samples = 2
cycles.subsurface_samples = 2 cycles.subsurface_samples = 2
cycles.volume_samples = 2