diff options
| author | Thomas Dinges <blender@dingto.org> | 2014-11-16 21:49:41 +0300 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2014-11-16 21:50:14 +0300 |
| commit | bfdb9f9e0f1aa4f22138bfb023c4348b19c9eeeb (patch) | |
| tree | 997662b0cd3e41d4fe046ecba2680bc32ccddeae /intern | |
| parent | a15d584a4f17c6234ed5c07214121779a790fee3 (diff) | |
Cycles: Remove Integrator volume sampling flag, that was moved to Shader.
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/app/cycles_xml.cpp | 1 | ||||
| -rw-r--r-- | intern/cycles/render/integrator.cpp | 2 | ||||
| -rw-r--r-- | intern/cycles/render/integrator.h | 1 |
3 files changed, 0 insertions, 4 deletions
diff --git a/intern/cycles/app/cycles_xml.cpp b/intern/cycles/app/cycles_xml.cpp index 431796e106b..9ce16d80f33 100644 --- a/intern/cycles/app/cycles_xml.cpp +++ b/intern/cycles/app/cycles_xml.cpp @@ -299,7 +299,6 @@ static void xml_read_integrator(const XMLReadState& state, pugi::xml_node node) xml_read_bool(&integrator->transparent_shadows, node, "transparent_shadows"); /* Volume */ - xml_read_int(&integrator->volume_homogeneous_sampling, node, "volume_homogeneous_sampling"); xml_read_float(&integrator->volume_step_size, node, "volume_step_size"); xml_read_int(&integrator->volume_max_steps, node, "volume_max_steps"); diff --git a/intern/cycles/render/integrator.cpp b/intern/cycles/render/integrator.cpp index 03a8cd5d2d3..ae7cc30eb23 100644 --- a/intern/cycles/render/integrator.cpp +++ b/intern/cycles/render/integrator.cpp @@ -39,7 +39,6 @@ Integrator::Integrator() transparent_max_bounce = max_bounce; transparent_shadows = false; - volume_homogeneous_sampling = 0; volume_max_steps = 1024; volume_step_size = 0.1f; @@ -189,7 +188,6 @@ bool Integrator::modified(const Integrator& integrator) transparent_min_bounce == integrator.transparent_min_bounce && transparent_max_bounce == integrator.transparent_max_bounce && transparent_shadows == integrator.transparent_shadows && - volume_homogeneous_sampling == integrator.volume_homogeneous_sampling && volume_max_steps == integrator.volume_max_steps && volume_step_size == integrator.volume_step_size && caustics_reflective == integrator.caustics_reflective && diff --git a/intern/cycles/render/integrator.h b/intern/cycles/render/integrator.h index 13c10e8ca94..110c354823b 100644 --- a/intern/cycles/render/integrator.h +++ b/intern/cycles/render/integrator.h @@ -39,7 +39,6 @@ public: int transparent_max_bounce; bool transparent_shadows; - int volume_homogeneous_sampling; int volume_max_steps; float volume_step_size; |