diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-11-30 14:16:19 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-11-30 14:16:19 +0300 |
commit | 06df05a35b1f205151c35089630c3256cf5db7fb (patch) | |
tree | bb1afb6480257b5a525d6cf5a025f19eef7ff2cf /source/blender/editors/space_view3d/view3d_view.c | |
parent | ed07bccf7c1fe7cbb54902e0269f8fc52773cf85 (diff) | |
parent | 84285c1e344067363f814f4d3861227cc9890d41 (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 4a637443a8d..98ae57e9c42 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_ex(depsgraph, v3d, rv3d, true); + ED_view3d_camera_lock_init(depsgraph, v3d, rv3d); } /* store the options we want to end with */ |