diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-08-26 03:12:36 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-08-26 03:15:20 +0300 |
| commit | 2e6cbd9bda1221036c4ec800d6e6aea35c436965 (patch) | |
| tree | a198c4c16ccaf5ab8c6cb8a6bd52f77860a35889 /source | |
| parent | 2f0eb2bfc6b2d97f912ce9538fc7d027a3efa801 (diff) | |
Fix T45901: Smooth-view w/ bg-image glitch
It was possible to rotate the view while the view was already moving
causing background images to show when they shouldn't.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_view.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/editors/space_view3d/view3d_view.c b/source/blender/editors/space_view3d/view3d_view.c index e111a473fdf..49ac3881fab 100644 --- a/source/blender/editors/space_view3d/view3d_view.c +++ b/source/blender/editors/space_view3d/view3d_view.c @@ -137,6 +137,9 @@ struct SmoothView3DStore { struct SmoothView3DState org; /* original */ bool to_camera; + + /* When smooth-view is enabled, store the 'rv3d->view' here, + * assign back when the view motion is completed. */ char org_view; double time_allowed; @@ -180,12 +183,12 @@ void ED_view3d_smooth_view_ex( /* if smoothview runs multiple times... */ if (rv3d->sms == NULL) { view3d_smooth_view_state_backup(&sms.org, v3d, rv3d); - sms.org_view = rv3d->view; } else { sms.org = rv3d->sms->org; - sms.org_view = rv3d->sms->org_view; } + sms.org_view = rv3d->view; + /* sms.to_camera = false; */ /* initizlized to zero anyway */ /* note on camera locking, this is a little confusing but works ok. |