[Bf-blender-cvs] [073be28] master: Cycles: Update Integrator Presets and Total Samples info for latest changes.

[Thomas Dinges]

Commit: 073be286b4e8c7bfdb04550f3de23cef701b8b75
Author: Thomas Dinges
Date:   Tue Jan 7 15:55:01 2014 +0100
https://developer.blender.org/rB073be286b4e8c7bfdb04550f3de23cef701b8b75

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

===================================================================

M	intern/cycles/blender/addon/presets.py
M	intern/cycles/blender/addon/ui.py
M	release/scripts/presets/cycles/sampling/final.py
M	release/scripts/presets/cycles/sampling/preview.py

===================================================================

diff --git a/intern/cycles/blender/addon/presets.py b/intern/cycles/blender/addon/presets.py
index 66ec3a3..9991fdb 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 d5f1447..0b107de 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 2ee4291..d03423b 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 c7af6c8..5f071c7 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