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/engines
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/engines')
-rw-r--r--source/blender/draw/engines/eevee/eevee_depth_of_field.c4
-rw-r--r--source/blender/draw/engines/eevee/eevee_lookdev.c4
-rw-r--r--source/blender/draw/engines/workbench/workbench_effect_dof.c4
3 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/draw/engines/eevee/eevee_depth_of_field.c b/source/blender/draw/engines/eevee/eevee_depth_of_field.c
index 880885a1efb..d693e9cbd08 100644
--- a/source/blender/draw/engines/eevee/eevee_depth_of_field.c
+++ b/source/blender/draw/engines/eevee/eevee_depth_of_field.c
@@ -89,8 +89,8 @@ int EEVEE_depth_of_field_init(EEVEE_ViewLayerData *UNUSED(sldata), EEVEE_Data *v
Camera *cam = (Camera *)camera->data;
/* Retrieve Near and Far distance */
- effects->dof_near_far[0] = -cam->clipsta;
- effects->dof_near_far[1] = -cam->clipend;
+ effects->dof_near_far[0] = -cam->clip_start;
+ effects->dof_near_far[1] = -cam->clip_end;
int buffer_size[2] = {(int)viewport_size[0] / 2, (int)viewport_size[1] / 2};
diff --git a/source/blender/draw/engines/eevee/eevee_lookdev.c b/source/blender/draw/engines/eevee/eevee_lookdev.c
index 4d62d1bceb9..7d35b931786 100644
--- a/source/blender/draw/engines/eevee/eevee_lookdev.c
+++ b/source/blender/draw/engines/eevee/eevee_lookdev.c
@@ -187,8 +187,8 @@ void EEVEE_lookdev_draw_background(EEVEE_Data *vedata)
params.offsety = 0.0f;
params.shiftx = 0.0f;
params.shifty = 0.0f;
- params.clipsta = 0.001f;
- params.clipend = 20.0f;
+ params.clip_start = 0.001f;
+ params.clip_end = 20.0f;
BKE_camera_params_compute_viewplane(&params, ar->winx, ar->winy, aspect[0], aspect[1]);
BKE_camera_params_compute_matrix(&params);
diff --git a/source/blender/draw/engines/workbench/workbench_effect_dof.c b/source/blender/draw/engines/workbench/workbench_effect_dof.c
index d5e9348e29a..25677a523e6 100644
--- a/source/blender/draw/engines/workbench/workbench_effect_dof.c
+++ b/source/blender/draw/engines/workbench/workbench_effect_dof.c
@@ -256,8 +256,8 @@ void workbench_dof_engine_init(WORKBENCH_Data *vedata, Object *camera)
wpd->dof_distance = -focus_dist;
wpd->dof_invsensorsize = full_size[0] / sensor_scaled;
- wpd->dof_near_far[0] = -cam->clipsta;
- wpd->dof_near_far[1] = -cam->clipend;
+ wpd->dof_near_far[0] = -cam->clip_start;
+ wpd->dof_near_far[1] = -cam->clip_end;
float blades = cam->gpu_dof.num_blades;
float rotation = cam->gpu_dof.rotation;