diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-11-30 10:15:52 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-11-30 10:16:21 +0300 |
| commit | d12461a9ba82d3654acc313b2b8b7fcc8427bf0d (patch) | |
| tree | 8e15e8874f98117bb13648756543bf1ffa02e2d9 /source/blender/editors/space_view3d/view3d_view.c | |
| parent | cb8afaf5db9de16965dbb693cbd43cf767d5e7ed (diff) | |
| parent | 3f31c28a025cf61e2c4df33f28467771ae603965 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/space_view3d/view3d_view.c')
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_view.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/space_view3d/view3d_view.c b/source/blender/editors/space_view3d/view3d_view.c index 98ae57e9c42..4a637443a8d 100644 --- a/source/blender/editors/space_view3d/view3d_view.c +++ b/source/blender/editors/space_view3d/view3d_view.c @@ -154,7 +154,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(depsgraph, v3d, rv3d); + ED_view3d_camera_lock_init_ex(depsgraph, v3d, rv3d, true); } /* store the options we want to end with */ |