Correction to last fix
authorCampbell Barton <ideasman42@gmail.com>
Wed, 23 Aug 2017 15:05:20 +0000 (01:05 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 23 Aug 2017 15:05:20 +0000 (01:05 +1000)
source/blender/editors/space_view3d/view3d_edit.c

index 863024514cc01c5fb4cabcdb66b4415c9498739f..f560754a7a951cf89a1bd4f0947f315e4cca0739 100644 (file)
@@ -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;