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/draw/modes
parentec471a9b1c14ea5dcb855de7e570e27ad70661c5 (diff)
DNA: rename near/far -> clip_start/clip_end
Rename for Camera, View3D (also CameraParams & Render not DNA)
Diffstat (limited to 'source/blender/draw/modes')
-rw-r--r--source/blender/draw/modes/object_mode.c8
1 files changed, 4 insertions, 4 deletions
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) {