Commit: 90f3102f9c3ee8f6360d24e6ed47f4e9d028c976
Author: Thomas Dinges
Date: Sun Nov 16 20:18:14 2014 +0100
Branches: master
https://developer.blender.org/rB90f3102f9c3ee8f6360d24e6ed47f4e9d028c976
Cycles Standalone: Updates for Volume sampling.
===================================================================
M intern/cycles/app/cycles_xml.cpp
===================================================================
diff --git a/intern/cycles/app/cycles_xml.cpp b/intern/cycles/app/cycles_xml.cpp
index 9ce16d8..8e641b6 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);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
