diff options
author | Thomas Dinges <blender@dingto.org> | 2014-11-16 22:18:14 +0300 |
---|---|---|
committer | Thomas Dinges <blender@dingto.org> | 2014-11-16 22:18:14 +0300 |
commit | 90f3102f9c3ee8f6360d24e6ed47f4e9d028c976 (patch) | |
tree | e1ef50358c3f374149a6159927e77be16f9fc4c0 /intern | |
parent | bfdb9f9e0f1aa4f22138bfb023c4348b19c9eeeb (diff) |
Cycles Standalone: Updates for Volume sampling.
Diffstat (limited to 'intern')
-rw-r--r-- | intern/cycles/app/cycles_xml.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/intern/cycles/app/cycles_xml.cpp b/intern/cycles/app/cycles_xml.cpp index 9ce16d80f33..8e641b6c373 100644 --- a/intern/cycles/app/cycles_xml.cpp +++ b/intern/cycles/app/cycles_xml.cpp @@ -801,8 +801,17 @@ static void xml_read_shader(const XMLReadState& state, pugi::xml_node node) xml_read_string(&shader->name, node, "name"); xml_read_bool(&shader->use_mis, node, "use_mis"); - xml_read_bool(&shader->use_transparent_shadow, node, "use_transparent_shadow"); + + /* Volume */ 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); state.scene->shaders.push_back(shader); |