diff options
author | Thomas Dinges <blender@dingto.org> | 2014-12-18 00:28:33 +0300 |
---|---|---|
committer | Thomas Dinges <blender@dingto.org> | 2014-12-18 00:28:33 +0300 |
commit | 3820d44979c52be4b537430d0b7b906dfdaf1116 (patch) | |
tree | 27d151a39db2948031981794c79b62070a733710 /intern/cycles | |
parent | cd4d5dcb468a710ea0c688c884379d25c5d6bd66 (diff) |
Cycles: Add missing entries in the Integrator constructor and some updates
to the XML API.
(Changes from the standalone repo)
Diffstat (limited to 'intern/cycles')
-rw-r--r-- | intern/cycles/app/cycles_xml.cpp | 8 | ||||
-rw-r--r-- | intern/cycles/render/integrator.cpp | 4 |
2 files changed, 12 insertions, 0 deletions
diff --git a/intern/cycles/app/cycles_xml.cpp b/intern/cycles/app/cycles_xml.cpp index 6123f35ae0c..528b3016b80 100644 --- a/intern/cycles/app/cycles_xml.cpp +++ b/intern/cycles/app/cycles_xml.cpp @@ -825,6 +825,14 @@ static void xml_read_background(const XMLReadState& state, pugi::xml_node node) Shader *shader = state.scene->shaders[state.scene->default_background]; xml_read_bool(&shader->heterogeneous_volume, node, "heterogeneous_volume"); + xml_read_int(&shader->volume_interpolation_method, node, "volume_interpolation_method"); + + if(xml_equal_string(node, "volume_sampling_method", "distance")) + shader->volume_sampling_method = VOLUME_SAMPLING_DISTANCE; + else if(xml_equal_string(node, "volume_sampling_method", "equiangular")) + shader->volume_sampling_method = VOLUME_SAMPLING_EQUIANGULAR; + else if(xml_equal_string(node, "volume_sampling_method", "multiple_importance")) + shader->volume_sampling_method = VOLUME_SAMPLING_MULTIPLE_IMPORTANCE; xml_read_shader_graph(state, shader, node); } diff --git a/intern/cycles/render/integrator.cpp b/intern/cycles/render/integrator.cpp index ae7cc30eb23..9b279660f9c 100644 --- a/intern/cycles/render/integrator.cpp +++ b/intern/cycles/render/integrator.cpp @@ -59,6 +59,10 @@ Integrator::Integrator() mesh_light_samples = 1; subsurface_samples = 1; volume_samples = 1; + + sample_all_lights_direct = true; + sample_all_lights_indirect = true; + method = PATH; sampling_pattern = SAMPLING_PATTERN_SOBOL; |