diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-02-16 04:21:44 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-02-16 04:26:07 +0300 |
| commit | 2f737c4f475a5625f9140b84ffd55435ca2fd805 (patch) | |
| tree | 900754833493ba12e26aefdeb9fde9bd1776b4cb /source/blender/collada | |
| parent | ec471a9b1c14ea5dcb855de7e570e27ad70661c5 (diff) | |
DNA: rename near/far -> clip_start/clip_end
Rename for Camera, View3D (also CameraParams & Render not DNA)
Diffstat (limited to 'source/blender/collada')
| -rw-r--r-- | source/blender/collada/CameraExporter.cpp | 8 | ||||
| -rw-r--r-- | source/blender/collada/DocumentImporter.cpp | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/collada/CameraExporter.cpp b/source/blender/collada/CameraExporter.cpp index 8a327e01651..b83f6a456ba 100644 --- a/source/blender/collada/CameraExporter.cpp +++ b/source/blender/collada/CameraExporter.cpp @@ -66,8 +66,8 @@ void CamerasExporter::operator()(Object *ob, Scene *sce) COLLADASW::PerspectiveOptic persp(mSW); persp.setXFov(RAD2DEGF(focallength_to_fov(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"); + persp.setZFar(cam->clip_end, false, "zfar"); + persp.setZNear(cam->clip_start, false, "znear"); COLLADASW::Camera ccam(mSW, &persp, cam_id, cam_name); exportBlenderProfile(ccam, cam); addCamera(ccam); @@ -80,8 +80,8 @@ void CamerasExporter::operator()(Object *ob, Scene *sce) COLLADASW::OrthographicOptic ortho(mSW); ortho.setXMag(cam->ortho_scale / 2, "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"); + ortho.setZFar(cam->clip_end, false, "zfar"); + ortho.setZNear(cam->clip_start, false, "znear"); COLLADASW::Camera ccam(mSW, &ortho, cam_id, cam_name); exportBlenderProfile(ccam, cam); addCamera(ccam); diff --git a/source/blender/collada/DocumentImporter.cpp b/source/blender/collada/DocumentImporter.cpp index a6a87cb7f32..057a321f03d 100644 --- a/source/blender/collada/DocumentImporter.cpp +++ b/source/blender/collada/DocumentImporter.cpp @@ -838,8 +838,8 @@ bool DocumentImporter::writeCamera(const COLLADAFW::Camera *camera) et->setData("shifty",&(cam->shifty)); et->setData("dof_distance",&(cam->dof_distance)); } - cam->clipsta = camera->getNearClippingPlane().getValue(); - cam->clipend = camera->getFarClippingPlane().getValue(); + cam->clip_start = camera->getNearClippingPlane().getValue(); + cam->clip_end = camera->getFarClippingPlane().getValue(); COLLADAFW::Camera::CameraType type = camera->getCameraType(); switch (type) { |