diff options
author | Thomas Dinges <blender@dingto.org> | 2014-09-05 22:39:35 +0400 |
---|---|---|
committer | Thomas Dinges <blender@dingto.org> | 2014-09-05 22:39:35 +0400 |
commit | 8243c55f14ae2686723e6e3eaeb7b83c3f8100f3 (patch) | |
tree | 8e55e69edc15c683f7043eb45f3f92ce856f261c /intern/cycles/blender/addon | |
parent | cdd1d5a93c432ddbee8a8e578b0c28781aef71da (diff) |
Cycles: Split caustics option, to allow separate control for Reflection and Refraction caustics.
This way artists can only disable/enable refraction or reflection caustics.
See Cycles logs for an example: http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.72/Cycles
Differential revision: https://developer.blender.org/D766
Diffstat (limited to 'intern/cycles/blender/addon')
-rw-r--r-- | intern/cycles/blender/addon/properties.py | 15 | ||||
-rw-r--r-- | intern/cycles/blender/addon/ui.py | 3 | ||||
-rw-r--r-- | intern/cycles/blender/addon/version_update.py | 12 |
3 files changed, 25 insertions, 5 deletions
diff --git a/intern/cycles/blender/addon/properties.py b/intern/cycles/blender/addon/properties.py index f3885b442ec..93f7b1d6abf 100644 --- a/intern/cycles/blender/addon/properties.py +++ b/intern/cycles/blender/addon/properties.py @@ -259,11 +259,18 @@ class CyclesRenderSettings(bpy.types.PropertyGroup): default=True, ) - cls.no_caustics = BoolProperty( - name="No Caustics", - description="Leave out caustics, resulting in a darker image with less noise", - default=False, + cls.caustics_reflective = BoolProperty( + name="Reflective Caustics", + description="Leave out reflective caustics, resulting in a darker image with less noise", + default=True, + ) + + cls.caustics_refractive = BoolProperty( + name="Refractive Caustics", + description="Leave out refractive caustics, resulting in a darker image with less noise", + default=True, ) + cls.blur_glossy = FloatProperty( name="Filter Glossy", description="Adaptively blur glossy shaders after blurry bounces, " diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py index 198926e2536..6e40c42fb2d 100644 --- a/intern/cycles/blender/addon/ui.py +++ b/intern/cycles/blender/addon/ui.py @@ -210,7 +210,8 @@ class CyclesRender_PT_light_paths(CyclesButtonsPanel, Panel): col.separator() - col.prop(cscene, "no_caustics") + col.prop(cscene, "caustics_reflective") + col.prop(cscene, "caustics_refractive") col.prop(cscene, "blur_glossy") col = split.column() diff --git a/intern/cycles/blender/addon/version_update.py b/intern/cycles/blender/addon/version_update.py index b0b4e1d24dd..20973907693 100644 --- a/intern/cycles/blender/addon/version_update.py +++ b/intern/cycles/blender/addon/version_update.py @@ -33,3 +33,15 @@ def do_versions(self): cscene = scene.cycles if not cscene.is_property_set("volume_bounces"): cscene.volume_bounces = 1 + + for scene in bpy.data.scenes: + cscene = scene.cycles + try: + if (cscene["no_caustics"] and + not cscene.is_property_set("caustics_reflective") and + not cscene.is_property_set("caustics_refractive")): + + cscene.caustics_reflective = False + cscene.caustics_refractive = False + except KeyError: + pass |