diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-12-11 05:10:56 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-12-11 05:10:56 +0300 |
| commit | 65b930af39bd3c89a2aed97d238c669d8788a892 (patch) | |
| tree | 9d1f312b91772f561977603a89627beb3c32cf65 /source/blender/blenkernel/intern/camera.c | |
| parent | 9a8b6d51c129aec9385b83391745ce4ac38e953b (diff) | |
| parent | 908b6d8be3c08157bf30e482e6fa848d728eb1ed (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/camera.c')
| -rw-r--r-- | source/blender/blenkernel/intern/camera.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/camera.c b/source/blender/blenkernel/intern/camera.c index 54ce0d3a903..7457fc8b7ad 100644 --- a/source/blender/blenkernel/intern/camera.c +++ b/source/blender/blenkernel/intern/camera.c @@ -378,7 +378,7 @@ void BKE_camera_view_frame_ex( facy = 0.5f * camera->ortho_scale * r_asp[1] * scale[1]; r_shift[0] = camera->shiftx * camera->ortho_scale * scale[0]; r_shift[1] = camera->shifty * camera->ortho_scale * scale[1]; - depth = do_clip ? -((camera->clipsta * scale[2]) + 0.1f) : -drawsize * camera->ortho_scale * scale[2]; + depth = do_clip ? -((camera->clipsta * scale[2]) + 0.1f) : -(drawsize * 2.0f) * scale[2]; *r_drawsize = 0.5f * camera->ortho_scale; } |