diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-12-11 06:30:24 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-12-11 06:42:50 +0300 |
| commit | 8216e9f8a26473373a8edc4916690642534e60e0 (patch) | |
| tree | deb523b34df5119446b21c935401b19527645080 /source/blender/blenkernel/intern/camera.c | |
| parent | 42126bdf0614c7ba58987b912f60d4a14a58a076 (diff) | |
DNA: version patch Camera.drawsize to twice it's value
Draw size represented half the actual size used.
Diffstat (limited to 'source/blender/blenkernel/intern/camera.c')
| -rw-r--r-- | source/blender/blenkernel/intern/camera.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/camera.c b/source/blender/blenkernel/intern/camera.c index 7457fc8b7ad..ab9129e107a 100644 --- a/source/blender/blenkernel/intern/camera.c +++ b/source/blender/blenkernel/intern/camera.c @@ -71,7 +71,7 @@ void BKE_camera_init(Camera *cam) cam->sensor_y = DEFAULT_SENSOR_HEIGHT; cam->clipsta = 0.1f; cam->clipend = 1000.0f; - cam->drawsize = 0.5f; + cam->drawsize = 1.0f; cam->ortho_scale = 6.0; cam->flag |= CAM_SHOWPASSEPARTOUT; cam->passepartalpha = 0.5f; @@ -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 * 2.0f) * scale[2]; + depth = do_clip ? -((camera->clipsta * scale[2]) + 0.1f) : -drawsize * scale[2]; *r_drawsize = 0.5f * camera->ortho_scale; } @@ -400,7 +400,7 @@ void BKE_camera_view_frame_ex( } else { /* fixed size, variable depth (stays a reasonable size in the 3D view) */ - *r_drawsize = drawsize / ((scale[0] + scale[1] + scale[2]) / 3.0f); + *r_drawsize = (drawsize / 2.0f) / ((scale[0] + scale[1] + scale[2]) / 3.0f); depth = *r_drawsize * camera->lens / (-half_sensor) * scale[2]; fac = *r_drawsize; scale_x = scale[0]; |