DNA: rename near/far -> clip_start/clip_end

Rename for Camera, View3D (also CameraParams & Render not DNA)

4 files changed, 16 insertions, 16 deletions

diff --git a/source/blender/render/extern/include/RE_pipeline.h b/source/blender/render/extern/include/RE_pipeline.h
index e4289bd48c5..5fe5c557855 100644
--- a/source/blender/render/extern/include/RE_pipeline.h
+++ b/source/blender/render/extern/include/RE_pipeline.h
@@ -241,8 +241,8 @@ void RE_ChangeModeFlag(struct Render *re, int flag, bool clear);
 struct Object *RE_GetCamera(struct Render *re); /* return camera override if set */
 void RE_SetOverrideCamera(struct Render *re, struct Object *camera);
 void RE_SetCamera(struct Render *re, struct Object *camera);
-void RE_SetWindow(struct Render *re, const rctf *viewplane, float clipsta, float clipend);
-void RE_SetOrtho(struct Render *re, const rctf *viewplane, float clipsta, float clipend);
+void RE_SetWindow(struct Render *re, const rctf *viewplane, float clip_start, float clip_end);
+void RE_SetOrtho(struct Render *re, const rctf *viewplane, float clip_start, float clip_end);
 
 /* option to set viewmatrix before making dbase */
 void RE_SetView(struct Render *re, float mat[4][4]);
diff --git a/source/blender/render/intern/include/render_types.h b/source/blender/render/intern/include/render_types.h
index 17a1e486307..35ae4534d85 100644
--- a/source/blender/render/intern/include/render_types.h
+++ b/source/blender/render/intern/include/render_types.h
@@ -99,8 +99,8 @@ struct Render {
 	float winmat[4][4];
 
 	/* clippping */
-	float clipsta;
-	float clipend;
+	float clip_start;
+	float clip_end;
 
 	/* main, scene, and its full copy of renderdata and world */
 	struct Main *main;
diff --git a/source/blender/render/intern/source/initrender.c b/source/blender/render/intern/source/initrender.c
index fde77d7fa19..ba1d796dbbd 100644
--- a/source/blender/render/intern/source/initrender.c
+++ b/source/blender/render/intern/source/initrender.c
@@ -146,8 +146,8 @@ static void re_camera_params_get(Render *re, CameraParams *params)
 {
 	copy_m4_m4(re->winmat, params->winmat);
 
-	re->clipsta = params->clipsta;
-	re->clipend = params->clipend;
+	re->clip_start = params->clip_start;
+	re->clip_end = params->clip_end;
 
 	re->viewplane = params->viewplane;
 }
@@ -193,8 +193,8 @@ void RE_GetCameraWindowWithOverscan(struct Render *re, float mat[4][4], float ov
 {
 	CameraParams params;
 	params.is_ortho = re->winmat[3][3] != 0.0f;
-	params.clipsta = re->clipsta;
-	params.clipend = re->clipend;
+	params.clip_start = re->clip_start;
+	params.clip_end = re->clip_end;
 	params.viewplane = re->viewplane;
 
 	overscan *= max_ff(BLI_rctf_size_x(&params.viewplane), BLI_rctf_size_y(&params.viewplane));
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c
index 75e31b6d3a9..a1635e9ec6c 100644
--- a/source/blender/render/intern/source/pipeline.c
+++ b/source/blender/render/intern/source/pipeline.c
@@ -928,31 +928,31 @@ void render_update_anim_renderdata(Render *re, RenderData *rd, ListBase *render_
 	BLI_duplicatelist(&re->r.views, &rd->views);
 }
 
-void RE_SetWindow(Render *re, const rctf *viewplane, float clipsta, float clipend)
+void RE_SetWindow(Render *re, const rctf *viewplane, float clip_start, float clip_end)
 {
 	/* re->ok flag? */
 
 	re->viewplane = *viewplane;
-	re->clipsta = clipsta;
-	re->clipend = clipend;
+	re->clip_start = clip_start;
+	re->clip_end = clip_end;
 
 	perspective_m4(re->winmat,
 	               re->viewplane.xmin, re->viewplane.xmax,
-	               re->viewplane.ymin, re->viewplane.ymax, re->clipsta, re->clipend);
+	               re->viewplane.ymin, re->viewplane.ymax, re->clip_start, re->clip_end);
 
 }
 
-void RE_SetOrtho(Render *re, const rctf *viewplane, float clipsta, float clipend)
+void RE_SetOrtho(Render *re, const rctf *viewplane, float clip_start, float clip_end)
 {
 	/* re->ok flag? */
 
 	re->viewplane = *viewplane;
-	re->clipsta = clipsta;
-	re->clipend = clipend;
+	re->clip_start = clip_start;
+	re->clip_end = clip_end;
 
 	orthographic_m4(re->winmat,
 	                re->viewplane.xmin, re->viewplane.xmax,
-	                re->viewplane.ymin, re->viewplane.ymax, re->clipsta, re->clipend);
+	                re->viewplane.ymin, re->viewplane.ymax, re->clip_start, re->clip_end);
 }
 
 void RE_GetViewPlane(Render *re, rctf *r_viewplane, rcti *r_disprect)