[Bf-blender-cvs] [3820d44] master: Cycles: Add missing entries in the Integrator constructor and some updates to the XML API.

[Thomas Dinges]

Commit: 3820d44979c52be4b537430d0b7b906dfdaf1116
Author: Thomas Dinges
Date:   Wed Dec 17 22:28:33 2014 +0100
Branches: master
https://developer.blender.org/rB3820d44979c52be4b537430d0b7b906dfdaf1116

Cycles: Add missing entries in the Integrator constructor and some updates
to the XML API.

(Changes from the standalone repo)

===================================================================

M	intern/cycles/app/cycles_xml.cpp
M	intern/cycles/render/integrator.cpp

===================================================================

diff --git a/intern/cycles/app/cycles_xml.cpp b/intern/cycles/app/cycles_xml.cpp
index 6123f35..528b301 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 ae7cc30..9b27966 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;