diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2016-04-29 00:46:00 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2016-04-29 00:57:20 +0300 |
commit | 636195e402e9272903c8d08f1999f7acf2f762fe (patch) | |
tree | a8449f7a0834274caea5783fed01939b552f012a /intern/cycles/blender | |
parent | a48d7407986d04492107a2ef16d0ff6f0d012c45 (diff) |
Fix T48301: Cycles incorrect render with CMJ and viewport samples 0.
Max samples 2147483647 was causing integer overflow.
Diffstat (limited to 'intern/cycles/blender')
-rw-r--r-- | intern/cycles/blender/addon/properties.py | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/intern/cycles/blender/addon/properties.py b/intern/cycles/blender/addon/properties.py index a5887bb9e2d..6f8383fc0af 100644 --- a/intern/cycles/blender/addon/properties.py +++ b/intern/cycles/blender/addon/properties.py @@ -193,57 +193,57 @@ class CyclesRenderSettings(bpy.types.PropertyGroup): cls.aa_samples = IntProperty( name="AA Samples", description="Number of antialiasing samples to render for each pixel", - min=1, max=10000, + min=1, max=2097151, default=4, ) cls.preview_aa_samples = IntProperty( name="AA Samples", description="Number of antialiasing samples to render in the viewport, unlimited if 0", - min=0, max=10000, + min=0, max=2097151, default=4, ) cls.diffuse_samples = IntProperty( name="Diffuse Samples", description="Number of diffuse bounce samples to render for each AA sample", - min=1, max=10000, + min=1, max=1024, default=1, ) cls.glossy_samples = IntProperty( name="Glossy Samples", description="Number of glossy bounce samples to render for each AA sample", - min=1, max=10000, + min=1, max=1024, default=1, ) cls.transmission_samples = IntProperty( name="Transmission Samples", description="Number of transmission bounce samples to render for each AA sample", - min=1, max=10000, + min=1, max=1024, default=1, ) cls.ao_samples = IntProperty( name="Ambient Occlusion Samples", description="Number of ambient occlusion samples to render for each AA sample", - min=1, max=10000, + min=1, max=1024, default=1, ) cls.mesh_light_samples = IntProperty( name="Mesh Light Samples", description="Number of mesh emission light samples to render for each AA sample", - min=1, max=10000, + min=1, max=1024, default=1, ) cls.subsurface_samples = IntProperty( name="Subsurface Samples", description="Number of subsurface scattering samples to render for each AA sample", - min=1, max=10000, + min=1, max=1024, default=1, ) cls.volume_samples = IntProperty( name="Volume Samples", description="Number of volume scattering samples to render for each AA sample", - min=1, max=10000, + min=1, max=1024, default=1, ) |