diff options
Diffstat (limited to 'intern/cycles/blender/addon/properties.py')
| -rw-r--r-- | intern/cycles/blender/addon/properties.py | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/intern/cycles/blender/addon/properties.py b/intern/cycles/blender/addon/properties.py index 8dbd80f3747..4484dcfbfd7 100644 --- a/intern/cycles/blender/addon/properties.py +++ b/intern/cycles/blender/addon/properties.py @@ -128,6 +128,12 @@ enum_volume_interpolation = ( ('CUBIC', "Cubic", "Smoothed high quality interpolation, but slower") ) +enum_world_mis = ( + ('NONE', "None", "Don't sample the background, faster but might cause noise for non-solid backgrounds"), + ('AUTOMATIC', "Auto", "Automatically try to determine the best setting"), + ('MANUAL', "Manual", "Manually set the resolution of the sampling map, higher values are slower and require more memory but reduce noise") + ) + enum_device_type = ( ('CPU', "CPU", "CPU", 0), ('CUDA', "CUDA", "CUDA", 1), @@ -938,15 +944,15 @@ class CyclesWorldSettings(bpy.types.PropertyGroup): description="Cycles world settings", type=cls, ) - cls.sample_as_light = BoolProperty( - name="Multiple Importance Sample", - description="Use multiple importance sampling for the environment, " - "enabling for non-solid colors is recommended", - default=True, + cls.sampling_method = EnumProperty( + name="Sampling method", + description="How to sample the background light", + items=enum_world_mis, + default='AUTOMATIC', ) cls.sample_map_resolution = IntProperty( name="Map Resolution", - description="Importance map size is resolution x resolution; " + description="Importance map size is resolution x resolution/2; " "higher values potentially produce less noise, at the cost of memory and speed", min=4, max=8192, default=1024, |