diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-03-14 21:00:10 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-03-14 21:00:10 +0300 |
| commit | 81a03e17f759316bb40fa4bd416bc2d8d3131bb6 (patch) | |
| tree | fad7b9ab268996ed61acf66c3cb322da726a3f13 /intern/cycles/blender/addon/properties.py | |
| parent | 9d4fd2573531ea841ed0940b3babbe76da2e6d02 (diff) | |
| parent | 57b5852bc8b8188e73e2ffd7c05aaa3f409c3025 (diff) | |
Merge branch 'blender2.7'
Diffstat (limited to 'intern/cycles/blender/addon/properties.py')
| -rw-r--r-- | intern/cycles/blender/addon/properties.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/blender/addon/properties.py b/intern/cycles/blender/addon/properties.py index 4933c849e0d..c6777bb32bf 100644 --- a/intern/cycles/blender/addon/properties.py +++ b/intern/cycles/blender/addon/properties.py @@ -192,13 +192,13 @@ class CyclesRenderSettings(bpy.types.PropertyGroup): samples: IntProperty( name="Samples", description="Number of samples to render for each pixel", - min=1, max=2147483647, + min=1, max=(1 << 24), default=128, ) preview_samples: IntProperty( name="Preview Samples", description="Number of samples to render in the viewport, unlimited if 0", - min=0, max=2147483647, + min=0, max=(1 << 24), default=32, ) preview_pause: BoolProperty( |