diff options
| author | Thomas Dinges <blender@dingto.org> | 2014-03-23 15:12:59 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2014-03-23 15:15:33 +0400 |
| commit | 31cc49b5dfe623cf2919d7d740f20b0219e704bc (patch) | |
| tree | 4e1a7f938f44c8fccc4a723cc434ad26100c8bed /intern/cycles/render/integrator.cpp | |
| parent | 58c22d8fe8d0399ecb137f0984b6fdb45fd57601 (diff) | |
Code cleanup: Move AA Samples variable, this is not exclusive to Branched Path.
Diffstat (limited to 'intern/cycles/render/integrator.cpp')
| -rw-r--r-- | intern/cycles/render/integrator.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/render/integrator.cpp b/intern/cycles/render/integrator.cpp index c81e7e3bbd7..e079e7e5ff1 100644 --- a/intern/cycles/render/integrator.cpp +++ b/intern/cycles/render/integrator.cpp @@ -122,7 +122,6 @@ void Integrator::device_update(Device *device, DeviceScene *dscene, Scene *scene kintegrator->sample_clamp_indirect = (sample_clamp_indirect == 0.0f)? FLT_MAX: sample_clamp_indirect*3.0f; kintegrator->branched = (method == BRANCHED_PATH); - kintegrator->aa_samples = aa_samples; kintegrator->diffuse_samples = diffuse_samples; kintegrator->glossy_samples = glossy_samples; kintegrator->transmission_samples = transmission_samples; @@ -134,6 +133,7 @@ void Integrator::device_update(Device *device, DeviceScene *dscene, Scene *scene kintegrator->sample_all_lights_indirect = sample_all_lights_indirect; kintegrator->sampling_pattern = sampling_pattern; + kintegrator->aa_samples = aa_samples; /* sobol directions table */ int max_samples = 1; |