diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-11-30 11:01:03 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-11-30 11:01:06 +0300 |
commit | 530e567578f04e1ae5452aea8694f2def7898299 (patch) | |
tree | 053c0c81e7b7d1180e4309994601a441e8225176 /source | |
parent | 3f31c28a025cf61e2c4df33f28467771ae603965 (diff) |
Revert "3D View: locked camera was using the original view offset"
This reverts commit 3f31c28a025cf61e2c4df33f28467771ae603965.
Gives issues zooming, could be resolved but it mostly worked OK before,
and it's not a priority to spend time on, so leave as is for now.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/editors/space_view3d/view3d_edit.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/view3d_utils.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/view3d_view.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c index 8442f5ea60e..679498ab16d 100644 --- a/source/blender/editors/space_view3d/view3d_edit.c +++ b/source/blender/editors/space_view3d/view3d_edit.c @@ -402,7 +402,7 @@ static void viewops_data_create( /* set the view from the camera, if view locking is enabled. * we may want to make this optional but for now its needed always */ - ED_view3d_camera_lock_init_ex(vod->v3d, vod->rv3d, false); + ED_view3d_camera_lock_init(vod->v3d, vod->rv3d); vod->init.dist = rv3d->dist; vod->init.camzoom = rv3d->camzoom; diff --git a/source/blender/editors/space_view3d/view3d_utils.c b/source/blender/editors/space_view3d/view3d_utils.c index d90f4c32fc0..68582644f34 100644 --- a/source/blender/editors/space_view3d/view3d_utils.c +++ b/source/blender/editors/space_view3d/view3d_utils.c @@ -460,7 +460,7 @@ void ED_view3d_camera_lock_init_ex(View3D *v3d, RegionView3D *rv3d, const bool c void ED_view3d_camera_lock_init(View3D *v3d, RegionView3D *rv3d) { - ED_view3d_camera_lock_init_ex(v3d, rv3d, false); + ED_view3d_camera_lock_init_ex(v3d, rv3d, true); } /** diff --git a/source/blender/editors/space_view3d/view3d_view.c b/source/blender/editors/space_view3d/view3d_view.c index 52b9b9e49be..92f226f72de 100644 --- a/source/blender/editors/space_view3d/view3d_view.c +++ b/source/blender/editors/space_view3d/view3d_view.c @@ -156,7 +156,7 @@ void ED_view3d_smooth_view_ex( * we allow camera option locking to initialize the view settings from the camera. */ if (sview->camera == NULL && sview->camera_old == NULL) { - ED_view3d_camera_lock_init_ex(v3d, rv3d, true); + ED_view3d_camera_lock_init(v3d, rv3d); } /* store the options we want to end with */ |