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:
authorCampbell Barton <ideasman42@gmail.com>2019-02-16 04:21:44 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-02-16 04:26:07 +0300
commit2f737c4f475a5625f9140b84ffd55435ca2fd805 (patch)
tree900754833493ba12e26aefdeb9fde9bd1776b4cb /source/blender/alembic
parentec471a9b1c14ea5dcb855de7e570e27ad70661c5 (diff)
DNA: rename near/far -> clip_start/clip_end
Rename for Camera, View3D (also CameraParams & Render not DNA)
Diffstat (limited to 'source/blender/alembic')
-rw-r--r--source/blender/alembic/intern/abc_camera.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/alembic/intern/abc_camera.cc b/source/blender/alembic/intern/abc_camera.cc
index 5ca0c36eefe..b1ba3f92fc7 100644
--- a/source/blender/alembic/intern/abc_camera.cc
+++ b/source/blender/alembic/intern/abc_camera.cc
@@ -73,8 +73,8 @@ void AbcCameraWriter::do_write()
m_camera_sample.setVerticalAperture(apperture_y);
m_camera_sample.setHorizontalFilmOffset(apperture_x * cam->shiftx);
m_camera_sample.setVerticalFilmOffset(apperture_y * cam->shifty * film_aspect);
- m_camera_sample.setNearClippingPlane(cam->clipsta);
- m_camera_sample.setFarClippingPlane(cam->clipend);
+ m_camera_sample.setNearClippingPlane(cam->clip_start);
+ m_camera_sample.setFarClippingPlane(cam->clip_end);
if (cam->dof_ob) {
Imath::V3f v(m_object->loc[0] - cam->dof_ob->loc[0],
@@ -159,8 +159,8 @@ void AbcCameraReader::readObjectData(Main *bmain, const ISampleSelector &sample_
bcam->sensor_y = apperture_y * 10;
bcam->shiftx = h_film_offset / apperture_x;
bcam->shifty = v_film_offset / apperture_y / film_aspect;
- bcam->clipsta = max_ff(0.1f, static_cast<float>(cam_sample.getNearClippingPlane()));
- bcam->clipend = static_cast<float>(cam_sample.getFarClippingPlane());
+ bcam->clip_start = max_ff(0.1f, static_cast<float>(cam_sample.getNearClippingPlane()));
+ bcam->clip_end = static_cast<float>(cam_sample.getFarClippingPlane());
bcam->gpu_dof.focus_distance = static_cast<float>(cam_sample.getFocusDistance());
bcam->gpu_dof.fstop = static_cast<float>(cam_sample.getFStop());