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/blender_sync.cpp | |
| parent | 9d4fd2573531ea841ed0940b3babbe76da2e6d02 (diff) | |
| parent | 57b5852bc8b8188e73e2ffd7c05aaa3f409c3025 (diff) | |
Merge branch 'blender2.7'
Diffstat (limited to 'intern/cycles/blender/blender_sync.cpp')
| -rw-r--r-- | intern/cycles/blender/blender_sync.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/intern/cycles/blender/blender_sync.cpp b/intern/cycles/blender/blender_sync.cpp index af936bbe7f6..91317cbb81b 100644 --- a/intern/cycles/blender/blender_sync.cpp +++ b/intern/cycles/blender/blender_sync.cpp @@ -769,6 +769,9 @@ SessionParams BlenderSync::get_session_params(BL::RenderEngine& b_engine, } } + /* Clamp samples. */ + params.samples = min(params.samples, Integrator::MAX_SAMPLES); + /* tiles */ const bool is_cpu = (params.device.type == DEVICE_CPU); if(!is_cpu && !background) { |