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/freestyle/intern | |
| 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/freestyle/intern')
| -rw-r--r-- | source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp | 12 | ||||
| -rw-r--r-- | source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp | 12 |
2 files changed, 12 insertions, 12 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; } diff --git a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp index 8a7cbd097be..d1d154e9abe 100644 --- a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp +++ b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp @@ -147,11 +147,11 @@ BlenderStrokeRenderer::BlenderStrokeRenderer(Render *re, int render_count) : Str Camera *camera = (Camera *)object_camera->data; camera->type = CAM_ORTHO; camera->ortho_scale = max(re->rectx, re->recty); - camera->clipsta = 0.1f; - camera->clipend = 100.0f; + camera->clip_start = 0.1f; + camera->clip_end = 100.0f; _z_delta = 0.00001f; - _z = camera->clipsta + _z_delta; + _z = camera->clip_start + _z_delta; object_camera->loc[0] = re->disprect.xmin + 0.5f * re->rectx; object_camera->loc[1] = re->disprect.ymin + 0.5f * re->recty; @@ -872,11 +872,11 @@ Object *BlenderStrokeRenderer::NewMesh() const Render *BlenderStrokeRenderer::RenderScene(Render * /*re*/, bool render) { Camera *camera = (Camera *)freestyle_scene->camera->data; - if (camera->clipend < _z) - camera->clipend = _z + _z_delta * 100.0f; + if (camera->clip_end < _z) + camera->clip_end = _z + _z_delta * 100.0f; #if 0 if (G.debug & G_DEBUG_FREESTYLE) { - cout << "clipsta " << camera->clipsta << ", clipend " << camera->clipend << endl; + cout << "clip_start " << camera->clip_start << ", clip_end " << camera->clip_end << endl; } #endif |