Merging r39717 through r39983 from trunk into soc-2011-tomato
[blender.git] / source / blender / collada / CameraExporter.cpp
index 9a687c3..8de7fb4 100644 (file)
@@ -73,19 +73,19 @@ void CamerasExporter::operator()(Object *ob, Scene *sce)
        
        if (cam->type == CAM_PERSP) {
                COLLADASW::PerspectiveOptic persp(mSW);
-               persp.setXFov(focallength_to_hfov((cam->lens)*(180.0f/M_PI), cam->sensor_x));
-               persp.setAspectRatio((float)(sce->r.xsch)/(float)(sce->r.ysch));
-               persp.setZFar(cam->clipend);
-               persp.setZNear(cam->clipsta);
+               persp.setXFov(focallength_to_hfov((cam->lens)*(180.0f/M_PI), 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");
                COLLADASW::Camera ccam(mSW, &persp, cam_id, cam_name);
                addCamera(ccam);
        }
        else {
                COLLADASW::OrthographicOptic ortho(mSW);
-               ortho.setXMag(cam->ortho_scale);
-               ortho.setAspectRatio((float)(sce->r.xsch)/(float)(sce->r.ysch));
-               ortho.setZFar(cam->clipend);
-               ortho.setZNear(cam->clipsta);
+               ortho.setXMag(cam->ortho_scale,"xmag");
+               ortho.setAspectRatio((float)(sce->r.xsch)/(float)(sce->r.ysch),false,"aspect_ratio");
+               ortho.setZFar(cam->clipend , false , "zfar");
+               ortho.setZNear(cam->clipsta, false , "znear");
                COLLADASW::Camera ccam(mSW, &ortho, cam_id, cam_name);
                addCamera(ccam);
        }