diff options
| author | Thomas Dinges <blender@dingto.org> | 2014-03-15 20:36:44 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2014-03-15 20:37:43 +0400 |
| commit | 211f08d89bb48312a426fe969e0d967cf637b66c (patch) | |
| tree | 92a33cfdb418e23c39f1d90eff61b24640ff4616 /intern/cycles/render | |
| parent | cb4c49ad973f7e31204f282e3da18af74dab5a7c (diff) | |
Cycles: Direct multi light sampling in the Branched Path Integrator is optional now.
Disabling this can improve performance, when we need a lot of AA Samples anyway, to clear up the render.
Simple example .blend: http://www.pasteall.org/blend/27582
Differential Revision: https://developer.blender.org/D392
Diffstat (limited to 'intern/cycles/render')
| -rw-r--r-- | intern/cycles/render/integrator.cpp | 2 | ||||
| -rw-r--r-- | intern/cycles/render/integrator.h | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/intern/cycles/render/integrator.cpp b/intern/cycles/render/integrator.cpp index 849157d9e91..c81e7e3bbd7 100644 --- a/intern/cycles/render/integrator.cpp +++ b/intern/cycles/render/integrator.cpp @@ -130,6 +130,7 @@ void Integrator::device_update(Device *device, DeviceScene *dscene, Scene *scene kintegrator->mesh_light_samples = mesh_light_samples; kintegrator->subsurface_samples = subsurface_samples; kintegrator->volume_samples = volume_samples; + kintegrator->sample_all_lights_direct = sample_all_lights_direct; kintegrator->sample_all_lights_indirect = sample_all_lights_indirect; kintegrator->sampling_pattern = sampling_pattern; @@ -199,6 +200,7 @@ bool Integrator::modified(const Integrator& integrator) volume_samples == integrator.volume_samples && motion_blur == integrator.motion_blur && sampling_pattern == integrator.sampling_pattern && + sample_all_lights_direct == integrator.sample_all_lights_direct && sample_all_lights_indirect == integrator.sample_all_lights_indirect); } diff --git a/intern/cycles/render/integrator.h b/intern/cycles/render/integrator.h index 587968dc1e4..2570b13808c 100644 --- a/intern/cycles/render/integrator.h +++ b/intern/cycles/render/integrator.h @@ -63,6 +63,7 @@ public: int mesh_light_samples; int subsurface_samples; int volume_samples; + bool sample_all_lights_direct; bool sample_all_lights_indirect; enum Method { |