[Bf-blender-cvs] [50d6067] master: Cycles: Several fixes for Presets.

[Thomas Dinges]

Commit: 50d6067f4e9f6bffa2a298240cf13fbef3f2cdbb
Author: Thomas Dinges
Date:   Sun Sep 7 04:03:23 2014 +0200
Branches: master
https://developer.blender.org/rB50d6067f4e9f6bffa2a298240cf13fbef3f2cdbb

Cycles: Several fixes for Presets.

* Fix caustic properties, was not updated.
* Remove wrong items, leftovers from panel splitting.
* Add missing items. Even if the bundled presets do not set those, a user expects that all properties inside the panel are taken into account, when adding a new preset.

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

M	intern/cycles/blender/addon/presets.py
M	release/scripts/presets/cycles/integrator/direct_light.py
M	release/scripts/presets/cycles/integrator/full_global_illumination.py
M	release/scripts/presets/cycles/integrator/limited_global_illumination.py

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

diff --git a/intern/cycles/blender/addon/presets.py b/intern/cycles/blender/addon/presets.py
index 84be09a..2ec65d7 100644
--- a/intern/cycles/blender/addon/presets.py
+++ b/intern/cycles/blender/addon/presets.py
@@ -33,13 +33,16 @@ class AddPresetIntegrator(AddPresetBase, Operator):
     preset_values = [
         "cycles.max_bounces",
         "cycles.min_bounces",
-        "cycles.no_caustics",
         "cycles.diffuse_bounces",
         "cycles.glossy_bounces",
         "cycles.transmission_bounces",
         "cycles.volume_bounces",
         "cycles.transparent_min_bounces",
-        "cycles.transparent_max_bounces"
+        "cycles.transparent_max_bounces",
+        "cycles.use_transparent_shadows",
+        "cycles.caustics_reflective",
+        "cycles.caustics_refractive",
+        "cycles.blur_glossy"
     ]
 
     preset_subdir = "cycles/integrator"
@@ -67,10 +70,13 @@ class AddPresetSampling(AddPresetBase, Operator):
         "cycles.mesh_light_samples",
         "cycles.subsurface_samples",
         "cycles.volume_samples",
-        "cycles.no_caustics",
-        "cycles.blur_glossy",
         "cycles.use_square_samples",
-        "cycles.progressive"
+        "cycles.progressive",
+        "cycles.seed",
+        "cycles.sample_clamp_direct",
+        "cycles.sample_clamp_indirect",
+        "cycles.sample_all_lights_direct",
+        "cycles.sample_all_lights_indirect",
     ]
 
     preset_subdir = "cycles/sampling"
diff --git a/release/scripts/presets/cycles/integrator/direct_light.py b/release/scripts/presets/cycles/integrator/direct_light.py
index b6f4149..12b332c 100644
--- a/release/scripts/presets/cycles/integrator/direct_light.py
+++ b/release/scripts/presets/cycles/integrator/direct_light.py
@@ -3,7 +3,8 @@ cycles = bpy.context.scene.cycles
 
 cycles.max_bounces = 8
 cycles.min_bounces = 8
-cycles.no_caustics = True
+cycles.caustics_reflective = False
+cycles.caustics_refractive = False
 cycles.diffuse_bounces = 0
 cycles.glossy_bounces = 1
 cycles.transmission_bounces = 2
diff --git a/release/scripts/presets/cycles/integrator/full_global_illumination.py b/release/scripts/presets/cycles/integrator/full_global_illumination.py
index ef069c0..69fa6e7 100644
--- a/release/scripts/presets/cycles/integrator/full_global_illumination.py
+++ b/release/scripts/presets/cycles/integrator/full_global_illumination.py
@@ -3,7 +3,8 @@ cycles = bpy.context.scene.cycles
 
 cycles.max_bounces = 128
 cycles.min_bounces = 3
-cycles.no_caustics = False
+cycles.caustics_reflective = True
+cycles.caustics_refractive = True
 cycles.diffuse_bounces = 128
 cycles.glossy_bounces = 128
 cycles.transmission_bounces = 128
diff --git a/release/scripts/presets/cycles/integrator/limited_global_illumination.py b/release/scripts/presets/cycles/integrator/limited_global_illumination.py
index 6fef42d..22a8478 100644
--- a/release/scripts/presets/cycles/integrator/limited_global_illumination.py
+++ b/release/scripts/presets/cycles/integrator/limited_global_illumination.py
@@ -3,7 +3,8 @@ cycles = bpy.context.scene.cycles
 
 cycles.max_bounces = 8
 cycles.min_bounces = 3
-cycles.no_caustics = True
+cycles.caustics_reflective = False
+cycles.caustics_refractive = False
 cycles.diffuse_bounces = 1
 cycles.glossy_bounces = 4
 cycles.transmission_bounces = 8