diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-03-14 19:29:18 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-03-14 19:39:00 +0300 |
commit | 7b38ad7286937d66d45a0c2c4c2d355bfa588e5f (patch) | |
tree | 71779a1f4831061d0e5987f7ffa991a552ed507e /intern/cycles/render/integrator.h | |
parent | 47da8dcbcad4ccc5349bc303394e1d01d1c822c5 (diff) |
Fix T57138: Cycles CMJ failing with viewport samples set to 0.
Can't use INT_MAX, CMJ runs into precision/overflow issues before that.
Diffstat (limited to 'intern/cycles/render/integrator.h')
-rw-r--r-- | intern/cycles/render/integrator.h | 4 |
1 files changed, 4 insertions, 0 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; |