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/freestyle/intern/blender_interface/BlenderFileLoader.cpp
parentec471a9b1c14ea5dcb855de7e570e27ad70661c5 (diff)
DNA: rename near/far -> clip_start/clip_end
Rename for Camera, View3D (also CameraParams & Render not DNA)
Diffstat (limited to 'source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp')
-rw-r--r--source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp
index a409810373e..95743c80e68 100644
--- a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp
+++ b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp
@@ -59,18 +59,18 @@ NodeGroup *BlenderFileLoader::Load()
_viewplane_bottom = _re->viewplane.ymin;
_viewplane_top = _re->viewplane.ymax;
- if (_re->clipsta < 0.f) {
+ if (_re->clip_start < 0.f) {
// Adjust clipping start/end and set up a Z offset when the viewport preview
- // is used with the orthographic view. In this case, _re->clipsta is negative,
+ // is used with the orthographic view. In this case, _re->clip_start is negative,
// while Freestyle assumes that imported mesh data are in the camera coordinate
// system with the view point located at origin [bug #36009].
_z_near = -0.001f;
- _z_offset = _re->clipsta + _z_near;
- _z_far = -_re->clipend + _z_offset;
+ _z_offset = _re->clip_start + _z_near;
+ _z_far = -_re->clip_end + _z_offset;
}
else {
- _z_near = -_re->clipsta;
- _z_far = -_re->clipend;
+ _z_near = -_re->clip_start;
+ _z_far = -_re->clip_end;
_z_offset = 0.f;
}