From 2f737c4f475a5625f9140b84ffd55435ca2fd805 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 16 Feb 2019 12:21:44 +1100 Subject: DNA: rename near/far -> clip_start/clip_end Rename for Camera, View3D (also CameraParams & Render not DNA) --- source/blender/draw/modes/object_mode.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'source/blender/draw/modes') diff --git a/source/blender/draw/modes/object_mode.c b/source/blender/draw/modes/object_mode.c index cf3c3267ac4..7e9dde4f210 100644 --- a/source/blender/draw/modes/object_mode.c +++ b/source/blender/draw/modes/object_mode.c @@ -616,10 +616,10 @@ static void OBJECT_engine_init(void *vedata) float dist; if (rv3d->persp == RV3D_CAMOB && v3d->camera && v3d->camera->type == OB_CAMERA) { Object *camera_object = DEG_get_evaluated_object(draw_ctx->depsgraph, v3d->camera); - dist = ((Camera *)(camera_object->data))->clipend; + dist = ((Camera *)(camera_object->data))->clip_end; } else { - dist = v3d->far; + dist = v3d->clip_end; } e_data.grid_settings[0] = dist / 2.0f; /* gridDistance */ @@ -1915,10 +1915,10 @@ static void DRW_shgroup_camera(OBJECT_ShadingGroupList *sgl, Object *ob, ViewLay DRW_shgroup_call_dynamic_add( sgl->camera_clip, color, - &cam->clipsta, &cam->clipend, cam->runtime.drw_normalmat); + &cam->clip_start, &cam->clip_end, cam->runtime.drw_normalmat); DRW_shgroup_call_dynamic_add( sgl->camera_clip_points, (is_active ? col_hi : col), - &cam->clipsta, &cam->clipend, cam->runtime.drw_normalmat); + &cam->clip_start, &cam->clip_end, cam->runtime.drw_normalmat); } if (cam->flag & CAM_SHOWMIST) { -- cgit v1.2.3