[Bf-blender-cvs] [b5b269a] master: Fix compilation of cycles standalone and network device

[Martijn Berger]

Commit: b5b269ac11679d52d3d062e1f584fef83acaefc0
Author: Martijn Berger
Date:   Fri Mar 11 10:00:47 2016 +0100
Branches: master
https://developer.blender.org/rBb5b269ac11679d52d3d062e1f584fef83acaefc0

Fix compilation of cycles standalone and network device

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

M	intern/cycles/CMakeLists.txt
M	intern/cycles/app/cycles_xml.cpp

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

diff --git a/intern/cycles/CMakeLists.txt b/intern/cycles/CMakeLists.txt
index d3ab894..13b5de3 100644
--- a/intern/cycles/CMakeLists.txt
+++ b/intern/cycles/CMakeLists.txt
@@ -216,6 +216,10 @@ if(WITH_CYCLES_BLENDER)
 	add_subdirectory(blender)
 endif()
 
+if(WITH_CYCLES_NETWORK)
+	add_definitions(-DWITH_NETWORK)
+endif()
+
 if(WITH_CYCLES_STANDALONE OR WITH_CYCLES_NETWORK)
 	add_subdirectory(app)
 endif()
diff --git a/intern/cycles/app/cycles_xml.cpp b/intern/cycles/app/cycles_xml.cpp
index a8f90c7..176f83f 100644
--- a/intern/cycles/app/cycles_xml.cpp
+++ b/intern/cycles/app/cycles_xml.cpp
@@ -359,7 +359,7 @@ static void xml_read_camera(const XMLReadState& state, pugi::xml_node node)
 	xml_read_float(&cam->fisheye_fov, node, "fisheye_fov");
 	xml_read_float(&cam->fisheye_lens, node, "fisheye_lens");
 
-	xml_read_float(&cam->use_spherical_stereo, node, "use_spherical_stereo");
+	xml_read_bool(&cam->use_spherical_stereo, node, "use_spherical_stereo");
 	xml_read_float(&cam->interocular_distance, node, "interocular_distance");
 	xml_read_float(&cam->convergence_distance, node, "convergence_distance");