Merging r40265 through r40492 from trunk into soc-2011-tomato
[blender.git] / source / blender / collada / CameraExporter.cpp
index 006d4c0..e1e76ce 100644 (file)
@@ -73,7 +73,7 @@ void CamerasExporter::operator()(Object *ob, Scene *sce)
        
        if (cam->type == CAM_PERSP) {
                COLLADASW::PerspectiveOptic persp(mSW);
-               persp.setXFov(RAD2DEGF(lens_to_angle(cam->lens)), "xfov");
+               persp.setXFov(RAD2DEGF(focallength_to_hfov(cam->lens), cam->sensor_x), "xfov");
                persp.setAspectRatio((float)(sce->r.xsch)/(float)(sce->r.ysch),false,"aspect_ratio");
                persp.setZFar(cam->clipend, false , "zfar");
                persp.setZNear(cam->clipsta,false , "znear");