diff options
Diffstat (limited to 'intern/cycles/blender/addon/properties.py')
| -rw-r--r-- | intern/cycles/blender/addon/properties.py | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/intern/cycles/blender/addon/properties.py b/intern/cycles/blender/addon/properties.py index 41fb9afbc4e..3b4982eef68 100644 --- a/intern/cycles/blender/addon/properties.py +++ b/intern/cycles/blender/addon/properties.py @@ -97,6 +97,11 @@ enum_sampling_pattern = ( ('CORRELATED_MUTI_JITTER', "Correlated Multi-Jitter", "Use Correlated Multi-Jitter random sampling pattern"), ) +enum_integrator = ( + ('BRANCHED_PATH', "Branched Path Tracing", "Path tracing integrator that branches on the first bounce, giving more control over the number of light and material samples"), + ('PATH', "Path Tracing", "Pure path tracing integrator"), + ) + class CyclesRenderSettings(bpy.types.PropertyGroup): @classmethod @@ -123,11 +128,13 @@ class CyclesRenderSettings(bpy.types.PropertyGroup): description="Use Open Shading Language (CPU rendering only)", ) - cls.progressive = BoolProperty( - name="Progressive", - description="Use progressive sampling of lighting", - default=True, + cls.integrator = EnumProperty( + name="Integrator", + description="Method to sample lights and materials", + items=enum_integrator, + default='PATH', ) + cls.use_square_samples = BoolProperty( name="Square Samples", description="Square sampling values for easier artist control", |