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/makesdna | |
| 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/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_camera_types.h | 2 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_view3d_types.h | 11 | ||||
| -rw-r--r-- | source/blender/makesdna/intern/dna_rename_defs.h | 4 |
3 files changed, 6 insertions, 11 deletions
diff --git a/source/blender/makesdna/DNA_camera_types.h b/source/blender/makesdna/DNA_camera_types.h index f73f3dc8def..f88cb4cce3f 100644 --- a/source/blender/makesdna/DNA_camera_types.h +++ b/source/blender/makesdna/DNA_camera_types.h @@ -86,7 +86,7 @@ typedef struct Camera { char dtx; short flag; float passepartalpha; - float clipsta, clipend; + float clip_start, clip_end; float lens, ortho_scale, drawsize; float sensor_x, sensor_y; float shiftx, shifty; diff --git a/source/blender/makesdna/DNA_view3d_types.h b/source/blender/makesdna/DNA_view3d_types.h index 633a9dd07b5..106328aa31f 100644 --- a/source/blender/makesdna/DNA_view3d_types.h +++ b/source/blender/makesdna/DNA_view3d_types.h @@ -44,15 +44,6 @@ struct wmTimer; #include "DNA_movieclip_types.h" #include "DNA_gpu_types.h" -/* ******************************** */ - -/* The near/far thing is a Win EXCEPTION, caused by indirect includes from <windows.h>. - * Thus, leave near/far in the code, and undef for windows. */ -#ifdef _WIN32 -# undef near -# undef far -#endif - typedef struct RegionView3D { /** GL_PROJECTION matrix. */ @@ -275,7 +266,7 @@ typedef struct View3D { int flag2; float lens, grid; - float near, far; + float clip_start, clip_end; float ofs[3] DNA_DEPRECATED; char _pad[4]; diff --git a/source/blender/makesdna/intern/dna_rename_defs.h b/source/blender/makesdna/intern/dna_rename_defs.h index 6ae1d17a64f..62752d6693a 100644 --- a/source/blender/makesdna/intern/dna_rename_defs.h +++ b/source/blender/makesdna/intern/dna_rename_defs.h @@ -44,6 +44,10 @@ DNA_STRUCT_RENAME(SpaceButs, SpaceProperties) DNA_STRUCT_RENAME(SpaceIpo, SpaceGraph) DNA_STRUCT_RENAME(SpaceOops, SpaceOutliner) DNA_STRUCT_RENAME_ELEM(Camera, YF_dofdist, dof_distance) +DNA_STRUCT_RENAME_ELEM(Camera, clipend, clip_end) +DNA_STRUCT_RENAME_ELEM(Camera, clipsta, clip_start) +DNA_STRUCT_RENAME_ELEM(View3D, far, clip_end) +DNA_STRUCT_RENAME_ELEM(View3D, near, clip_start) #if 0 DNA_STRUCT_RENAME(Lamp, Light) |