diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2014-09-01 17:37:21 +0400 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2014-09-01 17:38:22 +0400 |
| commit | f0653c3d3f1b24b45e6f1c5ac659bf130b58af3f (patch) | |
| tree | 82721843c274829a1441ad7291809545955db90c /intern/cycles/app | |
| parent | a8d2a6faf3beaf8363bd71c65c59e0ed1a1e7b5c (diff) | |
| parent | 575cbf0172508eb9d846f1c62027a9c0f4fddd34 (diff) | |
Merge branch 'master' into soc-2014-viewport_context
Also fix scons issues with SDL. There is still a linking problem
somewhere but i expect this is an issue in master as well.
Conflicts:
intern/cycles/SConscript
intern/ghost/CMakeLists.txt
intern/ghost/intern/GHOST_WindowX11.cpp
source/blender/nodes/CMakeLists.txt
Diffstat (limited to 'intern/cycles/app')
| -rw-r--r-- | intern/cycles/app/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | intern/cycles/app/cycles_xml.cpp | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/intern/cycles/app/CMakeLists.txt b/intern/cycles/app/CMakeLists.txt index 96ac7619cbe..c8464899725 100644 --- a/intern/cycles/app/CMakeLists.txt +++ b/intern/cycles/app/CMakeLists.txt @@ -29,6 +29,8 @@ set(LIBRARIES ${JPEG_LIBRARIES} ${ZLIB_LIBRARIES} ${TIFF_LIBRARY} + extern_clew + extern_cuew ) add_definitions(${GL_DEFINITIONS}) diff --git a/intern/cycles/app/cycles_xml.cpp b/intern/cycles/app/cycles_xml.cpp index 915ef96a517..6c001f8889b 100644 --- a/intern/cycles/app/cycles_xml.cpp +++ b/intern/cycles/app/cycles_xml.cpp @@ -329,6 +329,7 @@ static void xml_read_camera(const XMLReadState& state, pugi::xml_node node) xml_read_float(&cam->aperturesize, node, "aperturesize"); // 0.5*focallength/fstop xml_read_float(&cam->focaldistance, node, "focaldistance"); xml_read_float(&cam->shuttertime, node, "shuttertime"); + xml_read_float(&cam->aperture_ratio, node, "aperture_ratio"); if(xml_equal_string(node, "type", "orthographic")) cam->type = CAMERA_ORTHOGRAPHIC; |