diff options
| author | Martijn Berger <mberger@denc.com> | 2016-03-11 12:00:47 +0300 |
|---|---|---|
| committer | Martijn Berger <mberger@denc.com> | 2016-03-11 12:00:47 +0300 |
| commit | b5b269ac11679d52d3d062e1f584fef83acaefc0 (patch) | |
| tree | fae58736485ab8f3addaafbfb0c0160fdc5fabc2 | |
| parent | 0922b6d6de153fe038d5ab7b2b64f414f40c3adc (diff) | |
Fix compilation of cycles standalone and network device
| -rw-r--r-- | intern/cycles/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | intern/cycles/app/cycles_xml.cpp | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/intern/cycles/CMakeLists.txt b/intern/cycles/CMakeLists.txt index d3ab894e44a..13b5de360d5 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 a8f90c7e6d4..176f83f5fa4 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"); |