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/render | |
| parent | 9d4fd2573531ea841ed0940b3babbe76da2e6d02 (diff) | |
| parent | 57b5852bc8b8188e73e2ffd7c05aaa3f409c3025 (diff) | |
Merge branch 'blender2.7'
Diffstat (limited to 'intern/cycles/render')
| -rw-r--r-- | intern/cycles/render/integrator.h | 4 | ||||
| -rw-r--r-- | intern/cycles/render/session.h | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/intern/cycles/render/integrator.h b/intern/cycles/render/integrator.h index 6a7e2056851..da4e61d8153 100644 --- a/intern/cycles/render/integrator.h +++ b/intern/cycles/render/integrator.h @@ -55,6 +55,10 @@ public: float sample_clamp_indirect; bool motion_blur; + /* Maximum number of samples, beyond which we are likely to run into + * precision issues for sampling patterns. */ + static const int MAX_SAMPLES = (1 << 24); + int aa_samples; int diffuse_samples; int glossy_samples; diff --git a/intern/cycles/render/session.h b/intern/cycles/render/session.h index e3cccbb9fcf..cbdfc75a905 100644 --- a/intern/cycles/render/session.h +++ b/intern/cycles/render/session.h @@ -84,7 +84,7 @@ public: progressive = false; experimental = false; - samples = INT_MAX; + samples = 1024; tile_size = make_int2(64, 64); start_resolution = INT_MAX; pixel_size = 1; |