diff options
author | Thomas Dinges <blender@dingto.org> | 2016-02-06 00:45:36 +0300 |
---|---|---|
committer | Thomas Dinges <blender@dingto.org> | 2016-02-06 00:45:36 +0300 |
commit | 66a9698978d9ca1840b782612250ee77490376b3 (patch) | |
tree | 91de047ec1759469480663599cd2c6c7d96fa752 /intern/cycles/blender | |
parent | 469447f7077e42ec73d71e51f8f6bebc918fdfa6 (diff) |
Cycles: Change several default values (second batch).
This change the following values:
- World settings:
- Use MIS: On
- MIS Samples: 1
- MIS Resolution: 1024
Enabling World MIS per default won't make simple backgrounds (flat background color) slower,
see previous commit. This gets disabled internally if World MIS is not actually needed.
Diffstat (limited to 'intern/cycles/blender')
-rw-r--r-- | intern/cycles/blender/addon/properties.py | 6 | ||||
-rw-r--r-- | intern/cycles/blender/addon/version_update.py | 16 |
2 files changed, 19 insertions, 3 deletions
diff --git a/intern/cycles/blender/addon/properties.py b/intern/cycles/blender/addon/properties.py index f22ac25c832..81dafb82d51 100644 --- a/intern/cycles/blender/addon/properties.py +++ b/intern/cycles/blender/addon/properties.py @@ -796,20 +796,20 @@ class CyclesWorldSettings(bpy.types.PropertyGroup): name="Multiple Importance Sample", description="Use multiple importance sampling for the environment, " "enabling for non-solid colors is recommended", - default=False, + default=True, ) cls.sample_map_resolution = IntProperty( name="Map Resolution", description="Importance map size is resolution x resolution; " "higher values potentially produce less noise, at the cost of memory and speed", min=4, max=8192, - default=256, + default=1024, ) cls.samples = IntProperty( name="Samples", description="Number of light samples to render for each AA sample", min=1, max=10000, - default=4, + default=1, ) cls.max_bounces = IntProperty( name="Max Bounces", diff --git a/intern/cycles/blender/addon/version_update.py b/intern/cycles/blender/addon/version_update.py index 17b86261383..0d34eb295df 100644 --- a/intern/cycles/blender/addon/version_update.py +++ b/intern/cycles/blender/addon/version_update.py @@ -254,3 +254,19 @@ def do_versions(self): # Volume Sampling if not cmat.is_property_set("volume_sampling"): cmat.volume_sampling = 'DISTANCE' + + if bpy.data.version <= (2, 76, 9): + for world in bpy.data.worlds: + cworld = world.cycles + + # World MIS + if not cworld.is_property_set("sample_as_light"): + cworld.sample_as_light = False + + # World MIS Samples + if not cworld.is_property_set("samples"): + cworld.samples = 4 + + # World MIS Resolution + if not cworld.is_property_set("sample_map_resolution"): + cworld.sample_map_resolution = 256 |