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/editors/space_view3d/view3d_utils.c | |
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/editors/space_view3d/view3d_utils.c')
-rw-r--r-- | source/blender/editors/space_view3d/view3d_utils.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/source/blender/editors/space_view3d/view3d_utils.c b/source/blender/editors/space_view3d/view3d_utils.c index 08eceb8ebc3..7c49ea061cc 100644 --- a/source/blender/editors/space_view3d/view3d_utils.c +++ b/source/blender/editors/space_view3d/view3d_utils.c @@ -114,7 +114,7 @@ void ED_view3d_dist_range_get( float r_dist_range[2]) { r_dist_range[0] = v3d->grid * 0.001f; - r_dist_range[1] = v3d->far * 10.0f; + r_dist_range[1] = v3d->clip_end * 10.0f; } /** @@ -132,13 +132,13 @@ bool ED_view3d_clip_range_get( BKE_camera_params_from_view3d(¶ms, depsgraph, v3d, rv3d); if (use_ortho_factor && params.is_ortho) { - const float fac = 2.0f / (params.clipend - params.clipsta); - params.clipsta *= fac; - params.clipend *= fac; + const float fac = 2.0f / (params.clip_end - params.clip_start); + params.clip_start *= fac; + params.clip_end *= fac; } - if (r_clipsta) *r_clipsta = params.clipsta; - if (r_clipend) *r_clipend = params.clipend; + if (r_clipsta) *r_clipsta = params.clip_start; + if (r_clipend) *r_clipend = params.clip_end; return params.is_ortho; } @@ -146,7 +146,7 @@ bool ED_view3d_clip_range_get( bool ED_view3d_viewplane_get( Depsgraph *depsgraph, const View3D *v3d, const RegionView3D *rv3d, int winx, int winy, - rctf *r_viewplane, float *r_clipsta, float *r_clipend, float *r_pixsize) + rctf *r_viewplane, float *r_clip_start, float *r_clip_end, float *r_pixsize) { CameraParams params; @@ -155,8 +155,8 @@ bool ED_view3d_viewplane_get( BKE_camera_params_compute_viewplane(¶ms, winx, winy, 1.0f, 1.0f); if (r_viewplane) *r_viewplane = params.viewplane; - if (r_clipsta) *r_clipsta = params.clipsta; - if (r_clipend) *r_clipend = params.clipend; + if (r_clip_start) *r_clip_start = params.clip_start; + if (r_clip_end) *r_clip_end = params.clip_end; if (r_pixsize) *r_pixsize = params.viewdx; return params.is_ortho; @@ -1090,8 +1090,8 @@ float ED_view3d_radius_to_dist( if (persp == RV3D_CAMOB) { CameraParams params; BKE_camera_params_init(¶ms); - params.clipsta = v3d->near; - params.clipend = v3d->far; + params.clip_start = v3d->clip_start; + params.clip_end = v3d->clip_end; Object *camera_eval = DEG_get_evaluated_object(depsgraph, v3d->camera); BKE_camera_params_from_object(¶ms, camera_eval); |