Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Dinges <blender@dingto.org>2014-09-07 06:03:23 +0400
committerThomas Dinges <blender@dingto.org>2014-09-07 06:03:23 +0400
commit50d6067f4e9f6bffa2a298240cf13fbef3f2cdbb (patch)
treee5173e9eb7c7f0afa07e09f7f6e7b6e7b59c27b1 /release/scripts/presets
parent1ff83d8a37b8117abe2ea8e500452a124e73d25e (diff)
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.
Diffstat (limited to 'release/scripts/presets')
-rw-r--r--release/scripts/presets/cycles/integrator/direct_light.py3
-rw-r--r--release/scripts/presets/cycles/integrator/full_global_illumination.py3
-rw-r--r--release/scripts/presets/cycles/integrator/limited_global_illumination.py3
3 files changed, 6 insertions, 3 deletions
diff --git a/release/scripts/presets/cycles/integrator/direct_light.py b/release/scripts/presets/cycles/integrator/direct_light.py
index b6f41497177..12b332cb431 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 ef069c05eb6..69fa6e735bd 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 6fef42deaa4..22a8478d23b 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