diff options
| author | Thomas Dinges <blender@dingto.org> | 2014-05-12 12:45:11 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2014-05-12 12:45:11 +0400 |
| commit | 146a1c77eacb925eb7c86bb49495c0f09adc607c (patch) | |
| tree | d9e7a9cdf2505980edb00bae86023c5cfe63b571 /intern/cycles/render/integrator.cpp | |
| parent | f3dd6b8df23f3634cafe8aa9fdf54b9cf3eac1c1 (diff) | |
Cleanup: Remove unused hardcoded variables in the integrator.
Differential Revision: https://developer.blender.org/D525
Diffstat (limited to 'intern/cycles/render/integrator.cpp')
| -rw-r--r-- | intern/cycles/render/integrator.cpp | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/intern/cycles/render/integrator.cpp b/intern/cycles/render/integrator.cpp index b145ebec73c..59a0de07e5a 100644 --- a/intern/cycles/render/integrator.cpp +++ b/intern/cycles/render/integrator.cpp @@ -34,11 +34,9 @@ Integrator::Integrator() max_glossy_bounce = max_bounce; max_transmission_bounce = max_bounce; max_volume_bounce = max_bounce; - probalistic_termination = true; transparent_min_bounce = min_bounce; transparent_max_bounce = max_bounce; - transparent_probalistic = true; transparent_shadows = false; volume_homogeneous_sampling = 0; @@ -83,10 +81,7 @@ void Integrator::device_update(Device *device, DeviceScene *dscene, Scene *scene /* integrator parameters */ kintegrator->max_bounce = max_bounce + 1; - if(probalistic_termination) - kintegrator->min_bounce = min_bounce + 1; - else - kintegrator->min_bounce = kintegrator->max_bounce; + kintegrator->min_bounce = min_bounce + 1; kintegrator->max_diffuse_bounce = max_diffuse_bounce + 1; kintegrator->max_glossy_bounce = max_glossy_bounce + 1; @@ -98,10 +93,7 @@ void Integrator::device_update(Device *device, DeviceScene *dscene, Scene *scene kintegrator->max_volume_bounce = 1; kintegrator->transparent_max_bounce = transparent_max_bounce + 1; - if(transparent_probalistic) - kintegrator->transparent_min_bounce = transparent_min_bounce + 1; - else - kintegrator->transparent_min_bounce = kintegrator->transparent_max_bounce; + kintegrator->transparent_min_bounce = transparent_min_bounce + 1; kintegrator->transparent_shadows = transparent_shadows; @@ -175,10 +167,8 @@ bool Integrator::modified(const Integrator& integrator) max_glossy_bounce == integrator.max_glossy_bounce && max_transmission_bounce == integrator.max_transmission_bounce && max_volume_bounce == integrator.max_volume_bounce && - probalistic_termination == integrator.probalistic_termination && transparent_min_bounce == integrator.transparent_min_bounce && transparent_max_bounce == integrator.transparent_max_bounce && - transparent_probalistic == integrator.transparent_probalistic && transparent_shadows == integrator.transparent_shadows && volume_homogeneous_sampling == integrator.volume_homogeneous_sampling && volume_max_steps == integrator.volume_max_steps && |