Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2012-02-28 20:44:54 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2012-02-28 20:44:54 +0400
commit4a903395194aef1cfe97e4d50d73320a72280cf3 (patch)
tree056c15cc54f0d0446aef69c9b7f299023c01a69f /intern/cycles/app
parent0052cbed0dadafce44f818d3d2016254c3d914d0 (diff)
Cycles: support for camera rendering an environment map with equirectangular
environment map, by enabling the Panorama option in the camera. http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Camera#Panorama The focal length or sensor settings are not used, the UI can be tweaked still to communicate this, also panorama should probably become a proper camera type like perspective or ortho.
Diffstat (limited to 'intern/cycles/app')
-rw-r--r--intern/cycles/app/cycles_xml.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/intern/cycles/app/cycles_xml.cpp b/intern/cycles/app/cycles_xml.cpp
index 5e4b3da071d..283bdf52e03 100644
--- a/intern/cycles/app/cycles_xml.cpp
+++ b/intern/cycles/app/cycles_xml.cpp
@@ -288,9 +288,11 @@ static void xml_read_camera(const XMLReadState& state, pugi::xml_node node)
xml_read_float(&cam->shutterclose, node, "shutterclose");
if(xml_equal_string(node, "type", "orthographic"))
- cam->ortho = true;
+ cam->type = CAMERA_ORTHOGRAPHIC;
else if(xml_equal_string(node, "type", "perspective"))
- cam->ortho = false;
+ cam->type = CAMERA_PERSPECTIVE;
+ else if(xml_equal_string(node, "type", "environment"))
+ cam->type = CAMERA_ENVIRONMENT;
cam->matrix = state.tfm;