diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-08-23 18:05:20 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2017-09-04 13:58:54 +0300 |
| commit | 7997646c2d89478d61dc42c95a48d88660d56e21 (patch) | |
| tree | 3fde7e06355a4c347f18eec00318c5a31909397a /source/blender | |
| parent | 0ed5605bd582a0a22ad2e6d3c2cdbdb17c52bf37 (diff) | |
Correction to last fix
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_edit.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c index 6b4cdc28f8e..74732742555 100644 --- a/source/blender/editors/space_view3d/view3d_edit.c +++ b/source/blender/editors/space_view3d/view3d_edit.c @@ -750,8 +750,7 @@ static void viewops_data_create_ex( vod->use_dyn_ofs = false; } - /* Check we're in the camera view, otherwise we may switch out of axis views, see: T52490 */ - if (switch_from_camera && (rv3d->persp == RV3D_CAMOB)) { + if (switch_from_camera) { /* switch from camera view when: */ if (view3d_ensure_persp(vod->v3d, vod->ar)) { /* If we're switching from camera view to the perspective one, @@ -1674,7 +1673,7 @@ static int ndof_orbit_invoke(bContext *C, wmOperator *op, const wmEvent *event) viewops_data_alloc(C, op); viewops_data_create_ex( C, op, event, - viewops_orbit_mode_ex((U.uiflag & USER_ORBIT_SELECTION) != 0, false), false); + false, viewops_orbit_mode_ex((U.uiflag & USER_ORBIT_SELECTION) != 0, false)); vod = op->customdata; ED_view3d_smooth_view_force_finish(C, vod->v3d, vod->ar); @@ -1743,7 +1742,7 @@ static int ndof_orbit_zoom_invoke(bContext *C, wmOperator *op, const wmEvent *ev viewops_data_alloc(C, op); viewops_data_create_ex( C, op, event, - viewops_orbit_mode_ex((U.uiflag & USER_ORBIT_SELECTION) != 0, false), false); + false, viewops_orbit_mode_ex((U.uiflag & USER_ORBIT_SELECTION) != 0, false)); vod = op->customdata; |