Merge branch 'master' into blender2.8
[blender.git] / source / blender / editors / space_view3d / view3d_edit.c
index b02e4ad9764830c124e13de1333d1bce7610f7e9..95040e04d2096e4c3904228052e551b1dadd7395 100644 (file)
@@ -36,6 +36,7 @@
 #include <float.h>
 
 #include "DNA_armature_types.h"
+#include "DNA_camera_types.h"
 #include "DNA_curve_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 #include "BLI_utildefines.h"
 
 #include "BKE_armature.h"
+#include "BKE_camera.h"
 #include "BKE_context.h"
 #include "BKE_font.h"
+#include "BKE_layer.h"
 #include "BKE_library.h"
 #include "BKE_main.h"
 #include "BKE_object.h"
 #include "BKE_screen.h"
 #include "BKE_action.h"
 
-
-#include "BIF_gl.h"
-#include "BIF_glutil.h"
+#include "DEG_depsgraph.h"
+#include "DEG_depsgraph_query.h"
 
 #include "WM_api.h"
 #include "WM_types.h"
+#include "WM_message.h"
 
 #include "RNA_access.h"
 #include "RNA_define.h"
@@ -76,6 +79,7 @@
 #include "ED_mesh.h"
 #include "ED_gpencil.h"
 #include "ED_view3d.h"
+#include "ED_transform_snap_object_context.h"
 
 #include "UI_resources.h"
 
@@ -133,6 +137,7 @@ typedef struct ViewOpsData {
        ARegion *ar;
        View3D *v3d;
        RegionView3D *rv3d;
+       Depsgraph *depsgraph;
 
        /** Needed for continuous zoom. */
        wmTimer *timer;
@@ -218,6 +223,7 @@ static void viewops_data_alloc(bContext *C, wmOperator *op)
        /* store data */
        op->customdata = vod;
        vod->bmain = CTX_data_main(C);
+       vod->depsgraph = CTX_data_depsgraph(C);
        vod->scene = CTX_data_scene(C);
        vod->sa = CTX_wm_area(C);
        vod->ar = CTX_wm_region(C);
@@ -245,8 +251,11 @@ static bool view3d_orbit_calc_center(bContext *C, float r_dyn_ofs[3])
        static float lastofs[3] = {0, 0, 0};
        bool is_set = false;
 
+       const Depsgraph *depsgraph = CTX_data_depsgraph(C);
        Scene *scene = CTX_data_scene(C);
-       Object *ob_act = OBACT;
+       ViewLayer *view_layer_eval = DEG_get_evaluated_view_layer(depsgraph);
+       Object *ob_act_eval = OBACT(view_layer_eval);
+       Object *ob_act = DEG_get_original_object(ob_act_eval);
 
        if (ob_act && (ob_act->mode & OB_MODE_ALL_PAINT) &&
            /* with weight-paint + pose-mode, fall through to using calculateTransformCenter */
@@ -258,16 +267,16 @@ static bool view3d_orbit_calc_center(bContext *C, float r_dyn_ofs[3])
                 */
                if (ob_act->mode & (OB_MODE_SCULPT | OB_MODE_TEXTURE_PAINT | OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT)) {
                        float stroke[3];
-                       BKE_paint_stroke_get_average(scene, ob_act, stroke);
+                       BKE_paint_stroke_get_average(scene, ob_act_eval, stroke);
                        copy_v3_v3(lastofs, stroke);
                }
                else {
-                       copy_v3_v3(lastofs, ob_act->obmat[3]);
+                       copy_v3_v3(lastofs, ob_act_eval->obmat[3]);
                }
                is_set = true;
        }
        else if (ob_act && (ob_act->mode & OB_MODE_EDIT) && (ob_act->type == OB_FONT)) {
-               Curve *cu = ob_act->data;
+               Curve *cu = ob_act_eval->data;
                EditFont *ef = cu->editfont;
                int i;
 
@@ -277,33 +286,32 @@ static bool view3d_orbit_calc_center(bContext *C, float r_dyn_ofs[3])
                }
                mul_v2_fl(lastofs, 1.0f / 4.0f);
 
-               mul_m4_v3(ob_act->obmat, lastofs);
+               mul_m4_v3(ob_act_eval->obmat, lastofs);
 
                is_set = true;
        }
        else if (ob_act == NULL || ob_act->mode == OB_MODE_OBJECT) {
                /* object mode use boundbox centers */
-               View3D *v3d = CTX_wm_view3d(C);
-               Base *base;
+               Base *base_eval;
                unsigned int tot = 0;
                float select_center[3];
 
                zero_v3(select_center);
-               for (base = FIRSTBASE; base; base = base->next) {
-                       if (TESTBASE(v3d, base)) {
+               for (base_eval = FIRSTBASE(view_layer_eval); base_eval; base_eval = base_eval->next) {
+                       if (TESTBASE(base_eval)) {
                                /* use the boundbox if we can */
-                               Object *ob = base->object;
+                               Object *ob_eval = base_eval->object;
 
-                               if (ob->bb && !(ob->bb->flag & BOUNDBOX_DIRTY)) {
+                               if (ob_eval->bb && !(ob_eval->bb->flag & BOUNDBOX_DIRTY)) {
                                        float cent[3];
 
-                                       BKE_boundbox_calc_center_aabb(ob->bb, cent);
+                                       BKE_boundbox_calc_center_aabb(ob_eval->bb, cent);
 
-                                       mul_m4_v3(ob->obmat, cent);
+                                       mul_m4_v3(ob_eval->obmat, cent);
                                        add_v3_v3(select_center, cent);
                                }
                                else {
-                                       add_v3_v3(select_center, ob->obmat[3]);
+                                       add_v3_v3(select_center, ob_eval->obmat[3]);
                                }
                                tot++;
                        }
@@ -366,6 +374,7 @@ static void viewops_data_create(
         bContext *C, wmOperator *op, const wmEvent *event,
         enum eViewOpsFlag viewops_flag)
 {
+       Depsgraph *depsgraph = CTX_data_depsgraph(C);
        ViewOpsData *vod = op->customdata;
        RegionView3D *rv3d = vod->rv3d;
 
@@ -383,7 +392,7 @@ static void viewops_data_create(
                negate_v3_v3(fallback_depth_pt, rv3d->ofs);
 
                vod->use_dyn_ofs = ED_view3d_autodist(
-                       vod->bmain, vod->scene, vod->ar, vod->v3d,
+                       depsgraph, vod->ar, vod->v3d,
                        event->mval, vod->dyn_ofs, true, fallback_depth_pt);
        }
        else {
@@ -391,7 +400,7 @@ static void viewops_data_create(
        }
 
        if (viewops_flag & VIEWOPS_FLAG_PERSP_ENSURE) {
-               if (ED_view3d_persp_ensure(vod->v3d, vod->ar)) {
+               if (ED_view3d_persp_ensure(depsgraph, vod->v3d, vod->ar)) {
                        /* If we're switching from camera view to the perspective one,
                         * need to tag viewport update, so camera vuew and borders
                         * are properly updated.
@@ -402,7 +411,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(vod->v3d, vod->rv3d);
+       ED_view3d_camera_lock_init(depsgraph, vod->v3d, vod->rv3d);
 
        vod->init.dist = rv3d->dist;
        vod->init.camzoom = rv3d->camzoom;
@@ -506,8 +515,9 @@ static void viewops_data_create(
 static void viewops_data_free(bContext *C, wmOperator *op)
 {
        ARegion *ar;
+#if 0
        Paint *p = BKE_paint_get_active_from_context(C);
-
+#endif
        if (op->customdata) {
                ViewOpsData *vod = op->customdata;
                ar = vod->ar;
@@ -523,7 +533,9 @@ static void viewops_data_free(bContext *C, wmOperator *op)
                ar = CTX_wm_region(C);
        }
 
+#if 0
        if (p && (p->flags & PAINT_FAST_NAVIGATE))
+#endif
                ED_region_tag_redraw(ar);
 }
 
@@ -802,7 +814,7 @@ static void viewrotate_apply(ViewOpsData *vod, const int event_xy[2])
        vod->prev.event_xy[0] = event_xy[0];
        vod->prev.event_xy[1] = event_xy[1];
 
-       ED_view3d_camera_lock_sync(vod->v3d, rv3d);
+       ED_view3d_camera_lock_sync(vod->depsgraph, vod->v3d, rv3d);
 
        ED_region_tag_redraw(vod->ar);
 }
@@ -1100,7 +1112,6 @@ static void view3d_ndof_pan_zoom(
 
 static void view3d_ndof_orbit(
         const struct wmNDOFMotionData *ndof, ScrArea *sa, ARegion *ar,
-        /* optional, can be NULL*/
         ViewOpsData *vod, const bool apply_dyn_ofs)
 {
        View3D *v3d = sa->spacedata.first;
@@ -1110,7 +1121,7 @@ static void view3d_ndof_orbit(
 
        BLI_assert((rv3d->viewlock & RV3D_LOCKED) == 0);
 
-       ED_view3d_persp_ensure(v3d, ar);
+       ED_view3d_persp_ensure(vod->depsgraph, v3d, ar);
 
        rv3d->view = RV3D_VIEW_USER;
 
@@ -1299,6 +1310,7 @@ static int ndof_orbit_invoke(bContext *C, wmOperator *op, const wmEvent *event)
                return OPERATOR_CANCELLED;
        }
        else {
+               const Depsgraph *depsgraph = CTX_data_depsgraph(C);
                ViewOpsData *vod;
                View3D *v3d;
                RegionView3D *rv3d;
@@ -1319,7 +1331,7 @@ static int ndof_orbit_invoke(bContext *C, wmOperator *op, const wmEvent *event)
                /* off by default, until changed later this function */
                rv3d->rot_angle = 0.0f;
 
-               ED_view3d_camera_lock_init_ex(v3d, rv3d, false);
+               ED_view3d_camera_lock_init_ex(depsgraph, v3d, rv3d, false);
 
                if (ndof->progress != P_FINISHING) {
                        const bool has_rotation = NDOF_HAS_ROTATE;
@@ -1336,7 +1348,7 @@ static int ndof_orbit_invoke(bContext *C, wmOperator *op, const wmEvent *event)
                        }
                }
 
-               ED_view3d_camera_lock_sync(v3d, rv3d);
+               ED_view3d_camera_lock_sync(depsgraph, v3d, rv3d);
 
                ED_region_tag_redraw(vod->ar);
 
@@ -1367,6 +1379,7 @@ static int ndof_orbit_zoom_invoke(bContext *C, wmOperator *op, const wmEvent *ev
                return OPERATOR_CANCELLED;
        }
        else {
+               const Depsgraph *depsgraph = CTX_data_depsgraph(C);
                ViewOpsData *vod;
                View3D *v3d;
                RegionView3D *rv3d;
@@ -1388,7 +1401,7 @@ static int ndof_orbit_zoom_invoke(bContext *C, wmOperator *op, const wmEvent *ev
                /* off by default, until changed later this function */
                rv3d->rot_angle = 0.0f;
 
-               ED_view3d_camera_lock_init_ex(v3d, rv3d, false);
+               ED_view3d_camera_lock_init_ex(depsgraph, v3d, rv3d, false);
 
                if (ndof->progress == P_FINISHING) {
                        /* pass */
@@ -1431,13 +1444,13 @@ static int ndof_orbit_zoom_invoke(bContext *C, wmOperator *op, const wmEvent *ev
                        ED_view3d_distance_set(rv3d, 0.0f);
 
                        if (has_rotation) {
-                               view3d_ndof_orbit(ndof, vod->sa, vod->ar, NULL, false);
+                               view3d_ndof_orbit(ndof, vod->sa, vod->ar, vod, false);
                        }
 
                        ED_view3d_distance_set(rv3d, dist_backup);
                }
 
-               ED_view3d_camera_lock_sync(v3d, rv3d);
+               ED_view3d_camera_lock_sync(depsgraph, v3d, rv3d);
 
                ED_region_tag_redraw(vod->ar);
 
@@ -1471,6 +1484,7 @@ static int ndof_pan_invoke(bContext *C, wmOperator *UNUSED(op), const wmEvent *e
                return OPERATOR_CANCELLED;
        }
        else {
+               const Depsgraph *depsgraph = CTX_data_depsgraph(C);
                View3D *v3d = CTX_wm_view3d(C);
                RegionView3D *rv3d = CTX_wm_region_view3d(C);
                const wmNDOFMotionData *ndof = event->customdata;
@@ -1484,7 +1498,7 @@ static int ndof_pan_invoke(bContext *C, wmOperator *UNUSED(op), const wmEvent *e
                if (!(has_translate || has_zoom))
                        return OPERATOR_CANCELLED;
 
-               ED_view3d_camera_lock_init_ex(v3d, rv3d, false);
+               ED_view3d_camera_lock_init_ex(depsgraph, v3d, rv3d, false);
 
                if (ndof->progress != P_FINISHING) {
                        ScrArea *sa = CTX_wm_area(C);
@@ -1495,7 +1509,7 @@ static int ndof_pan_invoke(bContext *C, wmOperator *UNUSED(op), const wmEvent *e
                        }
                }
 
-               ED_view3d_camera_lock_sync(v3d, rv3d);
+               ED_view3d_camera_lock_sync(depsgraph, v3d, rv3d);
 
                ED_region_tag_redraw(CTX_wm_region(C));
 
@@ -1540,7 +1554,7 @@ static int ndof_all_invoke(bContext *C, wmOperator *op, const wmEvent *event)
 void VIEW3D_OT_ndof_all(struct wmOperatorType *ot)
 {
        /* identifiers */
-       ot->name = "NDOF Move View";
+       ot->name = "NDOF Pan View";
        ot->description = "Pan and rotate the view with the 3D mouse";
        ot->idname = "VIEW3D_OT_ndof_all";
 
@@ -1628,7 +1642,7 @@ static void viewmove_apply(ViewOpsData *vod, int x, int y)
        vod->prev.event_xy[0] = x;
        vod->prev.event_xy[1] = y;
 
-       ED_view3d_camera_lock_sync(vod->v3d, vod->rv3d);
+       ED_view3d_camera_lock_sync(vod->depsgraph, vod->v3d, vod->rv3d);
 
        ED_region_tag_redraw(vod->ar);
 }
@@ -1730,7 +1744,7 @@ void VIEW3D_OT_move(wmOperatorType *ot)
 {
 
        /* identifiers */
-       ot->name = "Move View";
+       ot->name = "Pan View";
        ot->description = "Move the view";
        ot->idname = "VIEW3D_OT_move";
 
@@ -1792,7 +1806,7 @@ void viewzoom_modal_keymap(wmKeyConfig *keyconf)
  * \param zoom_xy: Optionally zoom to window location (coords compatible w/ #wmEvent.x, y). Use when not NULL.
  */
 static void view_zoom_to_window_xy_camera(
-        Scene *scene, View3D *v3d,
+        Scene *scene, Depsgraph *depsgraph, View3D *v3d,
         ARegion *ar, float dfac, const int zoom_xy[2])
 {
        RegionView3D *rv3d = ar->regiondata;
@@ -1810,13 +1824,13 @@ static void view_zoom_to_window_xy_camera(
                float pt_dst[2];
                float delta_px[2];
 
-               ED_view3d_calc_camera_border(scene, ar, v3d, rv3d, &camera_frame_old, false);
+               ED_view3d_calc_camera_border(scene, depsgraph, ar, v3d, rv3d, &camera_frame_old, false);
                BLI_rctf_translate(&camera_frame_old, ar->winrct.xmin, ar->winrct.ymin);
 
                rv3d->camzoom = camzoom_new;
                CLAMP(rv3d->camzoom, RV3D_CAMZOOM_MIN, RV3D_CAMZOOM_MAX);
 
-               ED_view3d_calc_camera_border(scene, ar, v3d, rv3d, &camera_frame_new, false);
+               ED_view3d_calc_camera_border(scene, depsgraph, ar, v3d, rv3d, &camera_frame_new, false);
                BLI_rctf_translate(&camera_frame_new, ar->winrct.xmin, ar->winrct.ymin);
 
                BLI_rctf_transform_pt_v(&camera_frame_new, &camera_frame_old, pt_dst, pt_src);
@@ -1989,7 +2003,7 @@ static void viewzoom_apply_camera(
                /* calculate inverted, then invert again (needed because of camera zoom scaling) */
                zfac = 1.0f / zfac;
                view_zoom_to_window_xy_camera(
-                       vod->scene, vod->v3d,
+                       vod->scene, vod->depsgraph, vod->v3d,
                        vod->ar, zfac, zoom_to_pos ? vod->prev.event_xy : NULL);
        }
 
@@ -2027,7 +2041,7 @@ static void viewzoom_apply_3d(
                view3d_boxview_sync(vod->sa, vod->ar);
        }
 
-       ED_view3d_camera_lock_sync(vod->v3d, vod->rv3d);
+       ED_view3d_camera_lock_sync(vod->depsgraph, vod->v3d, vod->rv3d);
 
        ED_region_tag_redraw(vod->ar);
 }
@@ -2109,6 +2123,7 @@ static int viewzoom_modal(bContext *C, wmOperator *op, const wmEvent *event)
 
 static int viewzoom_exec(bContext *C, wmOperator *op)
 {
+       Depsgraph *depsgraph = CTX_data_depsgraph(C);
        Scene *scene = CTX_data_scene(C);
        View3D *v3d;
        RegionView3D *rv3d;
@@ -2151,7 +2166,7 @@ static int viewzoom_exec(bContext *C, wmOperator *op)
                const float step = 1.2f;
                /* this min and max is also in viewmove() */
                if (use_cam_zoom) {
-                       view_zoom_to_window_xy_camera(scene, v3d, ar, step, zoom_xy);
+                       view_zoom_to_window_xy_camera(scene, depsgraph, v3d, ar, step, zoom_xy);
                }
                else {
                        if (rv3d->dist < dist_range[1]) {
@@ -2162,7 +2177,7 @@ static int viewzoom_exec(bContext *C, wmOperator *op)
        else {
                const float step = 1.0f / 1.2f;
                if (use_cam_zoom) {
-                       view_zoom_to_window_xy_camera(scene, v3d, ar, step, zoom_xy);
+                       view_zoom_to_window_xy_camera(scene, depsgraph, v3d, ar, step, zoom_xy);
                }
                else {
                        if (rv3d->dist > dist_range[0]) {
@@ -2177,7 +2192,7 @@ static int viewzoom_exec(bContext *C, wmOperator *op)
 
        ED_view3d_depth_tag_update(rv3d);
 
-       ED_view3d_camera_lock_sync(v3d, rv3d);
+       ED_view3d_camera_lock_sync(depsgraph, v3d, rv3d);
        ED_view3d_camera_lock_autokey(v3d, rv3d, C, false, true);
 
        ED_region_tag_redraw(ar);
@@ -2371,7 +2386,7 @@ static void viewdolly_apply(ViewOpsData *vod, const int xy[2], const short zoom_
                view3d_boxview_sync(vod->sa, vod->ar);
        }
 
-       ED_view3d_camera_lock_sync(vod->v3d, vod->rv3d);
+       ED_view3d_camera_lock_sync(vod->depsgraph, vod->v3d, vod->rv3d);
 
        ED_region_tag_redraw(vod->ar);
 }
@@ -2472,7 +2487,7 @@ static int viewdolly_exec(bContext *C, wmOperator *op)
 
        ED_view3d_depth_tag_update(rv3d);
 
-       ED_view3d_camera_lock_sync(v3d, rv3d);
+       ED_view3d_camera_lock_sync(CTX_data_depsgraph(C), v3d, rv3d);
 
        ED_region_tag_redraw(ar);
 
@@ -2506,7 +2521,8 @@ static int viewdolly_invoke(bContext *C, wmOperator *op, const wmEvent *event)
        if (vod->rv3d->persp != RV3D_PERSP) {
                if (vod->rv3d->persp == RV3D_CAMOB) {
                        /* ignore rv3d->lpersp because dolly only makes sense in perspective mode */
-                       ED_view3d_persp_switch_from_camera(vod->v3d, vod->rv3d, RV3D_PERSP);
+                       const Depsgraph *depsgraph = CTX_data_depsgraph(C);
+                       ED_view3d_persp_switch_from_camera(depsgraph, vod->v3d, vod->rv3d, RV3D_PERSP);
                }
                else {
                        vod->rv3d->persp = RV3D_PERSP;
@@ -2640,7 +2656,7 @@ static void view3d_from_minmax(
                }
 
                if (ok_dist) {
-                       new_dist = ED_view3d_radius_to_dist(v3d, ar, persp, true, (size / 2) * VIEW3D_MARGIN);
+                       new_dist = ED_view3d_radius_to_dist(v3d, ar, CTX_data_depsgraph(C), persp, true, (size / 2) * VIEW3D_MARGIN);
                        if (rv3d->is_persp) {
                                /* don't zoom closer than the near clipping plane */
                                new_dist = max_ff(new_dist, v3d->near * 1.5f);
@@ -2695,8 +2711,9 @@ static int view3d_all_exec(bContext *C, wmOperator *op)
        ARegion *ar = CTX_wm_region(C);
        View3D *v3d = CTX_wm_view3d(C);
        Scene *scene = CTX_data_scene(C);
-       Base *base;
-       float *curs;
+       const Depsgraph *depsgraph = CTX_data_depsgraph(C);
+       ViewLayer *view_layer_eval = DEG_get_evaluated_view_layer(depsgraph);
+       Base *base_eval;
        const bool use_all_regions = RNA_boolean_get(op->ptr, "use_all_regions");
        const bool skip_camera = (ED_view3d_camera_lock_check(v3d, ar->regiondata) ||
                                  /* any one of the regions may be locked */
@@ -2709,24 +2726,26 @@ static int view3d_all_exec(bContext *C, wmOperator *op)
 
        if (center) {
                /* in 2.4x this also move the cursor to (0, 0, 0) (with shift+c). */
-               curs = ED_view3d_cursor3d_get(scene, v3d);
+               View3DCursor *cursor = ED_view3d_cursor3d_get(scene, v3d);
                zero_v3(min);
                zero_v3(max);
-               zero_v3(curs);
+               zero_v3(cursor->location);
+               unit_qt(cursor->rotation);
        }
        else {
                INIT_MINMAX(min, max);
        }
 
-       for (base = scene->base.first; base; base = base->next) {
-               if (BASE_VISIBLE(v3d, base)) {
+       for (base_eval = view_layer_eval->object_bases.first; base_eval; base_eval = base_eval->next) {
+               if (BASE_VISIBLE(base_eval)) {
                        changed = true;
 
-                       if (skip_camera && base->object == v3d->camera) {
+                       Object *ob = DEG_get_original_object(base_eval->object);
+                       if (skip_camera && ob == v3d->camera) {
                                continue;
                        }
 
-                       BKE_object_minmax(base->object, min, max, false);
+                       BKE_object_minmax(base_eval->object, min, max, false);
                }
        }
        if (!changed) {
@@ -2748,6 +2767,10 @@ static int view3d_all_exec(bContext *C, wmOperator *op)
                view3d_from_minmax(C, v3d, ar, min, max, true, smooth_viewtx);
        }
 
+       if (center) {
+               DEG_id_tag_update(&scene->id, DEG_TAG_COPY_ON_WRITE);
+       }
+
        return OPERATOR_FINISHED;
 }
 
@@ -2782,13 +2805,16 @@ void VIEW3D_OT_view_all(wmOperatorType *ot)
 /* like a localview without local!, was centerview() in 2.4x */
 static int viewselected_exec(bContext *C, wmOperator *op)
 {
-       Main *bmain = CTX_data_main(C);
        ARegion *ar = CTX_wm_region(C);
        View3D *v3d = CTX_wm_view3d(C);
        Scene *scene = CTX_data_scene(C);
+       Depsgraph *depsgraph = CTX_data_depsgraph(C);
+       ViewLayer *view_layer_eval = DEG_get_evaluated_view_layer(depsgraph);
        bGPdata *gpd = CTX_data_gpencil_data(C);
        const bool is_gp_edit = ((gpd) && (gpd->flag & GP_DATA_STROKE_EDITMODE));
-       Object *ob = OBACT;
+       const bool is_face_map = ((is_gp_edit == false) && ar->manipulator_map &&
+                                 WM_manipulatormap_is_any_selected(ar->manipulator_map));
+       Object *ob_eval = OBACT(view_layer_eval);
        Object *obedit = CTX_data_edit_object(C);
        float min[3], max[3];
        bool ok = false, ok_dist = true;
@@ -2799,28 +2825,27 @@ static int viewselected_exec(bContext *C, wmOperator *op)
        const int smooth_viewtx = WM_operator_smooth_viewtx_get(op);
 
        INIT_MINMAX(min, max);
-
-       if (is_gp_edit) {
-               ob = NULL;
+       if (is_gp_edit || is_face_map) {
+               ob_eval = NULL;
        }
 
-       if (ob && (ob->mode & OB_MODE_WEIGHT_PAINT)) {
+       if (ob_eval && (ob_eval->mode & OB_MODE_WEIGHT_PAINT)) {
                /* hard-coded exception, we look for the one selected armature */
                /* this is weak code this way, we should make a generic active/selection callback interface once... */
-               Base *base;
-               for (base = scene->base.first; base; base = base->next) {
-                       if (TESTBASELIB(v3d, base)) {
-                               if (base->object->type == OB_ARMATURE)
-                                       if (base->object->mode & OB_MODE_POSE)
+               Base *base_eval;
+               for (base_eval = view_layer_eval->object_bases.first; base_eval; base_eval = base_eval->next) {
+                       if (TESTBASELIB(base_eval)) {
+                               if (base_eval->object->type == OB_ARMATURE)
+                                       if (base_eval->object->mode & OB_MODE_POSE)
                                                break;
                        }
                }
-               if (base)
-                       ob = base->object;
+               if (base_eval)
+                       ob_eval = base_eval->object;
        }
 
-
        if (is_gp_edit) {
+               /* TODO(sergey): Check on this after gpencil merge. */
                CTX_DATA_BEGIN(C, bGPDstroke *, gps, editable_gpencil_strokes)
                {
                        /* we're only interested in selected points here... */
@@ -2832,38 +2857,48 @@ static int viewselected_exec(bContext *C, wmOperator *op)
                }
                CTX_DATA_END;
        }
+       else if (is_face_map) {
+               ok = WM_manipulatormap_minmax(ar->manipulator_map, true, true, min, max);
+       }
        else if (obedit) {
-               ok = ED_view3d_minmax_verts(obedit, min, max);    /* only selected */
+               /* only selected */
+               FOREACH_OBJECT_IN_MODE_BEGIN (view_layer_eval, obedit->mode, ob_eval_iter) {
+                       ok |= ED_view3d_minmax_verts(ob_eval_iter, min, max);
+               }
+               FOREACH_OBJECT_IN_MODE_END;
        }
-       else if (ob && (ob->mode & OB_MODE_POSE)) {
-               ok = BKE_pose_minmax(ob, min, max, true, true);
+       else if (ob_eval && (ob_eval->mode & OB_MODE_POSE)) {
+               FOREACH_OBJECT_IN_MODE_BEGIN (view_layer_eval, ob_eval->mode, ob_eval_iter) {
+                       ok |= BKE_pose_minmax(ob_eval_iter, min, max, true, true);
+               }
+               FOREACH_OBJECT_IN_MODE_END;
        }
-       else if (BKE_paint_select_face_test(ob)) {
-               ok = paintface_minmax(ob, min, max);
+       else if (BKE_paint_select_face_test(ob_eval)) {
+               ok = paintface_minmax(ob_eval, min, max);
        }
-       else if (ob && (ob->mode & OB_MODE_PARTICLE_EDIT)) {
-               ok = PE_minmax(bmain, scene, min, max);
+       else if (ob_eval && (ob_eval->mode & OB_MODE_PARTICLE_EDIT)) {
+               ok = PE_minmax(scene, view_layer_eval, min, max);
        }
-       else if (ob &&
-                (ob->mode & (OB_MODE_SCULPT | OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT | OB_MODE_TEXTURE_PAINT)))
+       else if (ob_eval &&
+                (ob_eval->mode & (OB_MODE_SCULPT | OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT | OB_MODE_TEXTURE_PAINT)))
        {
-               BKE_paint_stroke_get_average(scene, ob, min);
+               BKE_paint_stroke_get_average(scene, ob_eval, min);
                copy_v3_v3(max, min);
                ok = true;
                ok_dist = 0; /* don't zoom */
        }
        else {
-               Base *base;
-               for (base = FIRSTBASE; base; base = base->next) {
-                       if (TESTBASE(v3d, base)) {
+               Base *base_eval;
+               for (base_eval = FIRSTBASE(view_layer_eval); base_eval; base_eval = base_eval->next) {
+                       if (TESTBASE(base_eval)) {
 
-                               if (skip_camera && base->object == v3d->camera) {
+                               if (skip_camera && base_eval->object == v3d->camera) {
                                        continue;
                                }
 
                                /* account for duplis */
-                               if (BKE_object_minmax_dupli(bmain, scene, base->object, min, max, false) == 0)
-                                       BKE_object_minmax(base->object, min, max, false);  /* use if duplis not found */
+                               if (BKE_object_minmax_dupli(depsgraph, scene, base_eval->object, min, max, false) == 0)
+                                       BKE_object_minmax(base_eval->object, min, max, false);  /* use if duplis not found */
 
                                ok = 1;
                        }
@@ -2952,14 +2987,14 @@ static int view_lock_to_active_exec(bContext *C, wmOperator *UNUSED(op))
        Object *obact = CTX_data_active_object(C);
 
        if (v3d) {
-
                ED_view3d_lock_clear(v3d);
 
                v3d->ob_centre = obact; /* can be NULL */
 
                if (obact && obact->type == OB_ARMATURE) {
                        if (obact->mode & OB_MODE_POSE) {
-                               bPoseChannel *pcham_act = BKE_pose_channel_active(obact);
+                               Object *obact_eval = DEG_get_evaluated_object(CTX_data_depsgraph(C), obact);
+                               bPoseChannel *pcham_act = BKE_pose_channel_active(obact_eval);
                                if (pcham_act) {
                                        BLI_strncpy(v3d->ob_centre_bone, pcham_act->name, sizeof(v3d->ob_centre_bone));
                                }
@@ -3017,7 +3052,7 @@ static int viewcenter_cursor_exec(bContext *C, wmOperator *op)
 
                /* non camera center */
                float new_ofs[3];
-               negate_v3_v3(new_ofs, ED_view3d_cursor3d_get(scene, v3d));
+               negate_v3_v3(new_ofs, ED_view3d_cursor3d_get(scene, v3d)->location);
                ED_view3d_smooth_view(
                        C, v3d, ar, smooth_viewtx,
                        &(const V3D_SmoothParams) {.ofs = new_ofs});
@@ -3051,13 +3086,12 @@ void VIEW3D_OT_view_center_cursor(wmOperatorType *ot)
 
 static int viewcenter_pick_invoke(bContext *C, wmOperator *op, const wmEvent *event)
 {
-       Main *bmain = CTX_data_main(C);
        View3D *v3d = CTX_wm_view3d(C);
        RegionView3D *rv3d = CTX_wm_region_view3d(C);
-       Scene *scene = CTX_data_scene(C);
        ARegion *ar = CTX_wm_region(C);
 
        if (rv3d) {
+               struct Depsgraph *depsgraph = CTX_data_depsgraph(C);
                float new_ofs[3];
                const int smooth_viewtx = WM_operator_smooth_viewtx_get(op);
 
@@ -3065,7 +3099,7 @@ static int viewcenter_pick_invoke(bContext *C, wmOperator *op, const wmEvent *ev
 
                view3d_operator_needs_opengl(C);
 
-               if (ED_view3d_autodist(bmain, scene, ar, v3d, event->mval, new_ofs, false, NULL)) {
+               if (ED_view3d_autodist(depsgraph, ar, v3d, event->mval, new_ofs, false, NULL)) {
                        /* pass */
                }
                else {
@@ -3105,6 +3139,7 @@ void VIEW3D_OT_view_center_pick(wmOperatorType *ot)
 
 static int view3d_center_camera_exec(bContext *C, wmOperator *UNUSED(op)) /* was view3d_home() in 2.4x */
 {
+       Depsgraph *depsgraph = CTX_data_depsgraph(C);
        Scene *scene = CTX_data_scene(C);
        float xfac, yfac;
        float size[2];
@@ -3119,7 +3154,7 @@ static int view3d_center_camera_exec(bContext *C, wmOperator *UNUSED(op)) /* was
 
        rv3d->camdx = rv3d->camdy = 0.0f;
 
-       ED_view3d_calc_camera_border_size(scene, ar, v3d, rv3d, size);
+       ED_view3d_calc_camera_border_size(scene, depsgraph, ar, v3d, rv3d, size);
 
        /* 4px is just a little room from the edge of the area */
        xfac = (float)ar->winx / (float)(size[0] + 4);
@@ -3188,6 +3223,7 @@ void VIEW3D_OT_view_center_lock(wmOperatorType *ot)
 
 static int render_border_exec(bContext *C, wmOperator *op)
 {
+       Depsgraph *depsgraph = CTX_data_depsgraph(C);
        View3D *v3d = CTX_wm_view3d(C);
        ARegion *ar = CTX_wm_region(C);
        RegionView3D *rv3d = ED_view3d_context_rv3d(C);
@@ -3208,7 +3244,7 @@ static int render_border_exec(bContext *C, wmOperator *op)
        /* calculate range */
 
        if (rv3d->persp == RV3D_CAMOB) {
-               ED_view3d_calc_camera_border(scene, ar, v3d, rv3d, &vb, false);
+               ED_view3d_calc_camera_border(scene, depsgraph, ar, v3d, rv3d, &vb, false);
        }
        else {
                vb.xmin = 0;
@@ -3253,6 +3289,9 @@ static int render_border_exec(bContext *C, wmOperator *op)
                        v3d->flag2 |= V3D_RENDER_BORDER;
        }
 
+       if (rv3d->persp == RV3D_CAMOB) {
+               DEG_id_tag_update(&scene->id, DEG_TAG_COPY_ON_WRITE);
+       }
        return OPERATOR_FINISHED;
 }
 
@@ -3316,6 +3355,9 @@ static int clear_render_border_exec(bContext *C, wmOperator *UNUSED(op))
        border->xmax = 1.0f;
        border->ymax = 1.0f;
 
+       if (rv3d->persp == RV3D_CAMOB) {
+               DEG_id_tag_update(&scene->id, DEG_TAG_COPY_ON_WRITE);
+       }
        return OPERATOR_FINISHED;
 }
 
@@ -3342,11 +3384,9 @@ void VIEW3D_OT_clear_render_border(wmOperatorType *ot)
 
 static int view3d_zoom_border_exec(bContext *C, wmOperator *op)
 {
-       Main *bmain = CTX_data_main(C);
        ARegion *ar = CTX_wm_region(C);
        View3D *v3d = CTX_wm_view3d(C);
        RegionView3D *rv3d = CTX_wm_region_view3d(C);
-       Scene *scene = CTX_data_scene(C);
        const int smooth_viewtx = WM_operator_smooth_viewtx_get(op);
 
        /* Zooms in on a border drawn by the user */
@@ -3359,9 +3399,8 @@ static int view3d_zoom_border_exec(bContext *C, wmOperator *op)
        float new_ofs[3];
 
        /* ZBuffer depth vars */
-       bglMats mats;
        float depth_close = FLT_MAX;
-       double cent[2],  p[3];
+       float cent[2],  p[3];
 
        /* note; otherwise opengl won't work */
        view3d_operator_needs_opengl(C);
@@ -3375,8 +3414,7 @@ static int view3d_zoom_border_exec(bContext *C, wmOperator *op)
        ED_view3d_dist_range_get(v3d, dist_range);
 
        /* Get Z Depths, needed for perspective, nice for ortho */
-       bgl_get_mats(&mats);
-       ED_view3d_draw_depth(bmain, scene, ar, v3d, true);
+       ED_view3d_draw_depth(CTX_data_depsgraph(C), ar, v3d, true);
 
        {
                /* avoid allocating the whole depth buffer */
@@ -3391,11 +3429,11 @@ static int view3d_zoom_border_exec(bContext *C, wmOperator *op)
                MEM_SAFE_FREE(depth_temp.depths);
        }
 
-       cent[0] = (((double)rect.xmin) + ((double)rect.xmax)) / 2;
-       cent[1] = (((double)rect.ymin) + ((double)rect.ymax)) / 2;
+       cent[0] = (((float)rect.xmin) + ((float)rect.xmax)) / 2;
+       cent[1] = (((float)rect.ymin) + ((float)rect.ymax)) / 2;
 
        if (rv3d->is_persp) {
-               double p_corner[3];
+               float p_corner[3];
 
                /* no depths to use, we cant do anything! */
                if (depth_close == FLT_MAX) {
@@ -3403,23 +3441,14 @@ static int view3d_zoom_border_exec(bContext *C, wmOperator *op)
                        return OPERATOR_CANCELLED;
                }
                /* convert border to 3d coordinates */
-               if ((!gluUnProject(cent[0], cent[1], depth_close,
-                                  mats.modelview, mats.projection, (GLint *)mats.viewport,
-                                  &p[0], &p[1], &p[2])) ||
-                   (!gluUnProject((double)rect.xmin, (double)rect.ymin, depth_close,
-                                  mats.modelview, mats.projection, (GLint *)mats.viewport,
-                                  &p_corner[0], &p_corner[1], &p_corner[2])))
+               if ((!ED_view3d_unproject(ar, cent[0], cent[1], depth_close, p)) ||
+                   (!ED_view3d_unproject(ar, rect.xmin, rect.ymin, depth_close, p_corner)))
                {
                        return OPERATOR_CANCELLED;
                }
 
-               dvec[0] = p[0] - p_corner[0];
-               dvec[1] = p[1] - p_corner[1];
-               dvec[2] = p[2] - p_corner[2];
-
-               new_ofs[0] = -p[0];
-               new_ofs[1] = -p[1];
-               new_ofs[2] = -p[2];
+               sub_v3_v3v3(dvec, p, p_corner);
+               negate_v3_v3(new_ofs, p);
 
                new_dist = len_v3(dvec);
 
@@ -3434,13 +3463,8 @@ static int view3d_zoom_border_exec(bContext *C, wmOperator *op)
                new_dist = rv3d->dist;
 
                /* convert the drawn rectangle into 3d space */
-               if (depth_close != FLT_MAX && gluUnProject(cent[0], cent[1], depth_close,
-                                                          mats.modelview, mats.projection, (GLint *)mats.viewport,
-                                                          &p[0], &p[1], &p[2]))
-               {
-                       new_ofs[0] = -p[0];
-                       new_ofs[1] = -p[1];
-                       new_ofs[2] = -p[2];
+               if (depth_close != FLT_MAX && ED_view3d_unproject(ar, cent[0], cent[1], depth_close, p)) {
+                       negate_v3_v3(new_ofs, p);
                }
                else {
                        float mval_f[2];
@@ -3530,13 +3554,13 @@ void VIEW3D_OT_zoom_border(wmOperatorType *ot)
  * Sets the view to 1:1 camera/render-pixel.
  * \{ */
 
-static void view3d_set_1_to_1_viewborder(Scene *scene, ARegion *ar, View3D *v3d)
+static void view3d_set_1_to_1_viewborder(Scene *scene, Depsgraph *depsgraph, ARegion *ar, View3D *v3d)
 {
        RegionView3D *rv3d = ar->regiondata;
        float size[2];
        int im_width = (scene->r.size * scene->r.xsch) / 100;
 
-       ED_view3d_calc_camera_border_size(scene, ar, v3d, rv3d, size);
+       ED_view3d_calc_camera_border_size(scene, depsgraph, ar, v3d, rv3d, size);
 
        rv3d->camzoom = BKE_screen_view3d_zoom_from_fac((float)im_width / size[0]);
        CLAMP(rv3d->camzoom, RV3D_CAMZOOM_MIN, RV3D_CAMZOOM_MAX);
@@ -3544,6 +3568,7 @@ static void view3d_set_1_to_1_viewborder(Scene *scene, ARegion *ar, View3D *v3d)
 
 static int view3d_zoom_1_to_1_camera_exec(bContext *C, wmOperator *UNUSED(op))
 {
+       Depsgraph *depsgraph = CTX_data_depsgraph(C);
        Scene *scene = CTX_data_scene(C);
 
        View3D *v3d;
@@ -3552,7 +3577,7 @@ static int view3d_zoom_1_to_1_camera_exec(bContext *C, wmOperator *UNUSED(op))
        /* no NULL check is needed, poll checks */
        ED_view3d_context_user_region(C, &v3d, &ar);
 
-       view3d_set_1_to_1_viewborder(scene, ar, v3d);
+       view3d_set_1_to_1_viewborder(scene, depsgraph, ar, v3d);
 
        WM_event_add_notifier(C, NC_SPACE | ND_SPACE_VIEW3D, v3d);
 
@@ -3577,7 +3602,7 @@ void VIEW3D_OT_zoom_camera_1_to_1(wmOperatorType *ot)
 /** \} */
 
 /* -------------------------------------------------------------------- */
-/** \name View Axis/Type Operator
+/** \name View Axis Operator
  * \{ */
 
 static const EnumPropertyItem prop_view_items[] = {
@@ -3587,17 +3612,20 @@ static const EnumPropertyItem prop_view_items[] = {
        {RV3D_VIEW_TOP, "TOP", ICON_TRIA_UP, "Top", "View From the Top"},
        {RV3D_VIEW_FRONT, "FRONT", 0, "Front", "View From the Front"},
        {RV3D_VIEW_BACK, "BACK", 0, "Back", "View From the Back"},
-       {RV3D_VIEW_CAMERA, "CAMERA", ICON_CAMERA_DATA, "Camera", "View From the Active Camera"},
        {0, NULL, 0, NULL, NULL}
 };
 
 
 /* would like to make this a generic function - outside of transform */
 
+/**
+ * \param align_to_quat: When not NULL, set the axis relative to this rotation.
+ */
 static void axis_set_view(
         bContext *C, View3D *v3d, ARegion *ar,
         const float quat_[4],
-        short view, int perspo, bool align_active,
+        short view, int perspo,
+        const float *align_to_quat,
         const int smooth_viewtx)
 {
        RegionView3D *rv3d = ar->regiondata; /* no NULL check is needed, poll checks */
@@ -3607,29 +3635,12 @@ static void axis_set_view(
 
        normalize_qt_qt(quat, quat_);
 
-       if (align_active) {
-               /* align to active object */
-               Object *obact = CTX_data_active_object(C);
-               if (obact == NULL) {
-                       /* no active object, ignore this option */
-                       align_active = false;
-               }
-               else {
-                       float obact_quat[4];
-                       float twmat[3][3];
-
-                       /* same as transform manipulator when normal is set */
-                       ED_getTransformOrientationMatrix(C, twmat, V3D_AROUND_ACTIVE);
-
-                       mat3_to_quat(obact_quat, twmat);
-                       invert_qt_normalized(obact_quat);
-                       mul_qt_qtqt(quat, quat, obact_quat);
-
-                       rv3d->view = view = RV3D_VIEW_USER;
-               }
+       if (align_to_quat) {
+               mul_qt_qtqt(quat, quat, align_to_quat);
+               rv3d->view = view = RV3D_VIEW_USER;
        }
 
-       if (align_active == false) {
+       if (align_to_quat == NULL) {
                rv3d->view = view;
        }
 
@@ -3659,7 +3670,8 @@ static void axis_set_view(
                dist = rv3d->dist;
 
                /* so we animate _from_ the camera location */
-               ED_view3d_from_object(v3d->camera, rv3d->ofs, NULL, &rv3d->dist, NULL);
+               Object *camera_eval = DEG_get_evaluated_object(CTX_data_depsgraph(C), v3d->camera);
+               ED_view3d_from_object(camera_eval, rv3d->ofs, NULL, &rv3d->dist, NULL);
 
                ED_view3d_smooth_view(
                        C, v3d, ar, smooth_viewtx,
@@ -3684,15 +3696,13 @@ static void axis_set_view(
        }
 }
 
-static int viewnumpad_exec(bContext *C, wmOperator *op)
+static int view_axis_exec(bContext *C, wmOperator *op)
 {
        View3D *v3d;
        ARegion *ar;
        RegionView3D *rv3d;
-       Scene *scene = CTX_data_scene(C);
        static int perspo = RV3D_PERSP;
-       int viewnum, nextperspo;
-       bool align_active;
+       int viewnum;
        const int smooth_viewtx = WM_operator_smooth_viewtx_get(op);
 
        /* no NULL check is needed, poll checks */
@@ -3702,118 +3712,209 @@ static int viewnumpad_exec(bContext *C, wmOperator *op)
        ED_view3d_smooth_view_force_finish(C, v3d, ar);
 
        viewnum = RNA_enum_get(op->ptr, "type");
-       align_active = RNA_boolean_get(op->ptr, "align_active");
 
-       /* Use this to test if we started out with a camera */
+       float align_quat_buf[4];
+       float *align_quat = NULL;
 
-       if (rv3d->persp == RV3D_CAMOB) {
-               nextperspo = rv3d->lpersp;
-       }
-       else {
-               nextperspo = perspo;
+       if (RNA_boolean_get(op->ptr, "align_active")) {
+               /* align to active object */
+               Object *obact = CTX_data_active_object(C);
+               if (obact != NULL) {
+                       float twmat[3][3];
+                       /* same as transform manipulator when normal is set */
+                       ED_getTransformOrientationMatrix(C, twmat, V3D_AROUND_ACTIVE);
+                       align_quat = align_quat_buf;
+                       mat3_to_quat(align_quat, twmat);
+                       invert_qt_normalized(align_quat);
+               }
        }
 
-       if (RV3D_VIEW_IS_AXIS(viewnum)) {
-               float quat[4];
+       if (RNA_boolean_get(op->ptr, "relative")) {
+               float z_rel[3];
 
-               ED_view3d_quat_from_axis_view(viewnum, quat);
-               axis_set_view(C, v3d, ar, quat, viewnum, nextperspo, align_active, smooth_viewtx);
+               if (viewnum == RV3D_VIEW_RIGHT) {
+                       negate_v3_v3(z_rel, rv3d->viewinv[0]);
+               }
+               else if (viewnum == RV3D_VIEW_LEFT) {
+                       copy_v3_v3(z_rel, rv3d->viewinv[0]);
+               }
+               else if (viewnum == RV3D_VIEW_TOP) {
+                       negate_v3_v3(z_rel, rv3d->viewinv[1]);
+               }
+               else if (viewnum == RV3D_VIEW_BOTTOM) {
+                       copy_v3_v3(z_rel, rv3d->viewinv[1]);
+               }
+               else if (viewnum == RV3D_VIEW_FRONT) {
+                       negate_v3_v3(z_rel, rv3d->viewinv[2]);
+               }
+               else if (viewnum == RV3D_VIEW_BACK) {
+                       copy_v3_v3(z_rel, rv3d->viewinv[2]);
+               }
+               else {
+                       BLI_assert(0);
+               }
+
+               float angle_max = FLT_MAX;
+               int view_closest = -1;
+               for (int i = RV3D_VIEW_FRONT; i <= RV3D_VIEW_BOTTOM; i++) {
+                       float quat[4];
+                       float mat[3][3];
+                       ED_view3d_quat_from_axis_view(i, quat);
+                       quat[0] *= -1.0f;
+                       quat_to_mat3(mat, quat);
+                       if (align_quat) {
+                               mul_qt_qtqt(quat, quat, align_quat);
+                       }
+                       const float angle_test = angle_normalized_v3v3(z_rel, mat[2]);
+                       if (angle_max > angle_test) {
+                               angle_max = angle_test;
+                               view_closest = i;
+                       }
+               }
+               if (view_closest == -1) {
+                       view_closest = RV3D_VIEW_FRONT;
+               }
+               viewnum = view_closest;
        }
-       else if (viewnum == RV3D_VIEW_CAMERA) {
-               if ((rv3d->viewlock & RV3D_LOCKED) == 0) {
-                       /* lastview -  */
 
-                       if (rv3d->persp != RV3D_CAMOB) {
-                               Object *ob = OBACT;
+       /* Use this to test if we started out with a camera */
+       const int nextperspo = (rv3d->persp == RV3D_CAMOB) ? rv3d->lpersp : perspo;
+       float quat[4];
+       ED_view3d_quat_from_axis_view(viewnum, quat);
+       axis_set_view(C, v3d, ar, quat, viewnum, nextperspo, align_quat, smooth_viewtx);
+
+       perspo = rv3d->persp;
 
-                               if (!rv3d->smooth_timer) {
-                                       /* store settings of current view before allowing overwriting with camera view
-                                        * only if we're not currently in a view transition */
+       return OPERATOR_FINISHED;
+}
 
-                                       ED_view3d_lastview_store(rv3d);
-                               }
+
+void VIEW3D_OT_view_axis(wmOperatorType *ot)
+{
+       PropertyRNA *prop;
+
+       /* identifiers */
+       ot->name = "View Axis";
+       ot->description = "Use a preset viewpoint";
+       ot->idname = "VIEW3D_OT_view_axis";
+
+       /* api callbacks */
+       ot->exec = view_axis_exec;
+       ot->poll = ED_operator_rv3d_user_region_poll;
+
+       /* flags */
+       ot->flag = 0;
+
+       ot->prop = RNA_def_enum(ot->srna, "type", prop_view_items, 0, "View", "Preset viewpoint to use");
+       RNA_def_property_flag(ot->prop, PROP_SKIP_SAVE);
+       prop = RNA_def_boolean(ot->srna, "align_active", 0, "Align Active", "Align to the active object's axis");
+       RNA_def_property_flag(prop, PROP_SKIP_SAVE);
+       prop = RNA_def_boolean(ot->srna, "relative", 0, "Relative", "Rotate relative to the current orientation");
+       RNA_def_property_flag(prop, PROP_SKIP_SAVE);
+}
+
+/** \} */
+
+/* -------------------------------------------------------------------- */
+/** \name View Camera Operator
+ * \{ */
+
+static int view_camera_exec(bContext *C, wmOperator *op)
+{
+       View3D *v3d;
+       ARegion *ar;
+       RegionView3D *rv3d;
+       const int smooth_viewtx = WM_operator_smooth_viewtx_get(op);
+
+       /* no NULL check is needed, poll checks */
+       ED_view3d_context_user_region(C, &v3d, &ar);
+       rv3d = ar->regiondata;
+
+       ED_view3d_smooth_view_force_finish(C, v3d, ar);
+
+       if ((rv3d->viewlock & RV3D_LOCKED) == 0) {
+               /* lastview -  */
+
+               ViewLayer *view_layer = CTX_data_view_layer(C);
+               Scene *scene = CTX_data_scene(C);
+
+               if (rv3d->persp != RV3D_CAMOB) {
+                       Object *ob = OBACT(view_layer);
+
+                       if (!rv3d->smooth_timer) {
+                               /* store settings of current view before allowing overwriting with camera view
+                                * only if we're not currently in a view transition */
+
+                               ED_view3d_lastview_store(rv3d);
+                       }
 
 #if 0
-                               if (G.qual == LR_ALTKEY) {
-                                       if (oldcamera && is_an_active_object(oldcamera)) {
-                                               v3d->camera = oldcamera;
-                                       }
-                                       handle_view3d_lock();
+                       if (G.qual == LR_ALTKEY) {
+                               if (oldcamera && is_an_active_object(oldcamera)) {
+                                       v3d->camera = oldcamera;
                                }
+                               handle_view3d_lock();
+                       }
 #endif
 
-                               /* first get the default camera for the view lock type */
-                               if (v3d->scenelock) {
-                                       /* sets the camera view if available */
+                       /* first get the default camera for the view lock type */
+                       if (v3d->scenelock) {
+                               /* sets the camera view if available */
+                               v3d->camera = scene->camera;
+                       }
+                       else {
+                               /* use scene camera if one is not set (even though we're unlocked) */
+                               if (v3d->camera == NULL) {
                                        v3d->camera = scene->camera;
                                }
-                               else {
-                                       /* use scene camera if one is not set (even though we're unlocked) */
-                                       if (v3d->camera == NULL) {
-                                               v3d->camera = scene->camera;
-                                       }
-                               }
+                       }
 
-                               /* if the camera isn't found, check a number of options */
-                               if (v3d->camera == NULL && ob && ob->type == OB_CAMERA)
-                                       v3d->camera = ob;
+                       /* if the camera isn't found, check a number of options */
+                       if (v3d->camera == NULL && ob && ob->type == OB_CAMERA)
+                               v3d->camera = ob;
 
-                               if (v3d->camera == NULL)
-                                       v3d->camera = BKE_scene_camera_find(scene);
+                       if (v3d->camera == NULL)
+                               v3d->camera = BKE_view_layer_camera_find(view_layer);
 
-                               /* couldnt find any useful camera, bail out */
-                               if (v3d->camera == NULL)
-                                       return OPERATOR_CANCELLED;
+                       /* couldnt find any useful camera, bail out */
+                       if (v3d->camera == NULL)
+                               return OPERATOR_CANCELLED;
 
-                               /* important these don't get out of sync for locked scenes */
-                               if (v3d->scenelock)
-                                       scene->camera = v3d->camera;
+                       /* important these don't get out of sync for locked scenes */
+                       if (v3d->scenelock)
+                               scene->camera = v3d->camera;
 
-                               /* finally do snazzy view zooming */
-                               rv3d->persp = RV3D_CAMOB;
-                               ED_view3d_smooth_view(
-                                       C, v3d, ar, smooth_viewtx,
-                                       &(const V3D_SmoothParams) {
-                                           .camera = v3d->camera, .ofs = rv3d->ofs, .quat = rv3d->viewquat,
-                                           .dist = &rv3d->dist, .lens = &v3d->lens});
-                       }
-                       else {
-                               /* return to settings of last view */
-                               /* does view3d_smooth_view too */
-                               axis_set_view(C, v3d, ar,
-                                             rv3d->lviewquat,
-                                             rv3d->lview, rv3d->lpersp, 0,
-                                             smooth_viewtx);
-                       }
+                       /* finally do snazzy view zooming */
+                       rv3d->persp = RV3D_CAMOB;
+                       ED_view3d_smooth_view(
+                               C, v3d, ar, smooth_viewtx,
+                               &(const V3D_SmoothParams) {
+                                   .camera = v3d->camera, .ofs = rv3d->ofs, .quat = rv3d->viewquat,
+                                   .dist = &rv3d->dist, .lens = &v3d->lens});
+               }
+               else {
+                       /* return to settings of last view */
+                       /* does view3d_smooth_view too */
+                       axis_set_view(C, v3d, ar, rv3d->lviewquat, rv3d->lview, rv3d->lpersp, NULL, smooth_viewtx);
                }
        }
 
-       if (rv3d->persp != RV3D_CAMOB) perspo = rv3d->persp;
-
        return OPERATOR_FINISHED;
 }
 
-
-void VIEW3D_OT_viewnumpad(wmOperatorType *ot)
+void VIEW3D_OT_view_camera(wmOperatorType *ot)
 {
-       PropertyRNA *prop;
-
        /* identifiers */
-       ot->name = "View Numpad";
-       ot->description = "Use a preset viewpoint";
-       ot->idname = "VIEW3D_OT_viewnumpad";
+       ot->name = "View Camera";
+       ot->description = "Toggle the camera view";
+       ot->idname = "VIEW3D_OT_view_camera";
 
        /* api callbacks */
-       ot->exec = viewnumpad_exec;
+       ot->exec = view_camera_exec;
        ot->poll = ED_operator_rv3d_user_region_poll;
 
        /* flags */
        ot->flag = 0;
-
-       ot->prop = RNA_def_enum(ot->srna, "type", prop_view_items, 0, "View", "Preset viewpoint to use");
-       RNA_def_property_flag(ot->prop, PROP_SKIP_SAVE);
-       prop = RNA_def_boolean(ot->srna, "align_active", 0, "Align Active", "Align to the active object's axis");
-       RNA_def_property_flag(prop, PROP_SKIP_SAVE);
 }
 
 /** \} */
@@ -3867,7 +3968,8 @@ static int vieworbit_exec(bContext *C, wmOperator *op)
                        float quat_new[4];
 
                        if (view_opposite == RV3D_VIEW_USER) {
-                               ED_view3d_persp_ensure(v3d, ar);
+                               const Depsgraph *depsgraph = CTX_data_depsgraph(C);
+                               ED_view3d_persp_ensure(depsgraph, v3d, ar);
                        }
 
                        if (ELEM(orbitdir, V3D_VIEW_STEPLEFT, V3D_VIEW_STEPRIGHT)) {
@@ -3992,7 +4094,7 @@ static void viewroll_apply(ViewOpsData *vod, int x, int UNUSED(y))
                view3d_boxview_sync(vod->sa, vod->ar);
        }
 
-       ED_view3d_camera_lock_sync(vod->v3d, vod->rv3d);
+       ED_view3d_camera_lock_sync(vod->depsgraph, vod->v3d, vod->rv3d);
 
        ED_region_tag_redraw(vod->ar);
 }
@@ -4226,8 +4328,8 @@ static int viewpan_invoke(bContext *C, wmOperator *op, const wmEvent *event)
 void VIEW3D_OT_view_pan(wmOperatorType *ot)
 {
        /* identifiers */
-       ot->name = "View Pan";
-       ot->description = "Pan the view";
+       ot->name = "Pan View Direction";
+       ot->description = "Pan the view in a given direction";
        ot->idname = "VIEW3D_OT_view_pan";
 
        /* api callbacks */
@@ -4325,52 +4427,67 @@ void VIEW3D_OT_navigate(wmOperatorType *ot)
 /** \name Background Image Add Operator
  * \{ */
 
-static BGpic *background_image_add(bContext *C)
+
+static Camera *background_image_camera_from_context(bContext *C)
 {
+       /* Needed to support drag-and-drop & camera buttons context. */
        View3D *v3d = CTX_wm_view3d(C);
-
-       return ED_view3d_background_image_new(v3d);
+       if (v3d != NULL) {
+               if (v3d->camera && v3d->camera->data && v3d->camera->type == OB_CAMERA) {
+                       return v3d->camera->data;
+               }
+               return NULL;
+       }
+       else {
+               return CTX_data_pointer_get_type(C, "camera", &RNA_Camera).data;
+       }
 }
 
 static int background_image_add_exec(bContext *C, wmOperator *UNUSED(op))
 {
-       background_image_add(C);
+       Camera *cam = background_image_camera_from_context(C);
+       BKE_camera_background_image_new(cam);
 
        return OPERATOR_FINISHED;
 }
 
 static int background_image_add_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(event))
 {
-       View3D *v3d = CTX_wm_view3d(C);
+       Camera *cam = background_image_camera_from_context(C);
        Image *ima;
-       BGpic *bgpic;
+       CameraBGImage *bgpic;
 
        ima = (Image *)WM_operator_drop_load_path(C, op, ID_IM);
        /* may be NULL, continue anyway */
 
-       bgpic = background_image_add(C);
+       bgpic = BKE_camera_background_image_new(cam);
        bgpic->ima = ima;
 
-       v3d->flag |= V3D_DISPBGPICS;
+       cam->flag |= CAM_SHOW_BG_IMAGE;
 
-       WM_event_add_notifier(C, NC_SPACE | ND_SPACE_VIEW3D, v3d);
+       WM_event_add_notifier(C, NC_CAMERA | ND_DRAW_RENDER_VIEWPORT, cam);
 
        return OPERATOR_FINISHED;
 }
 
+static bool background_image_add_poll(bContext *C)
+{
+       return background_image_camera_from_context(C) != NULL;
+}
+
 void VIEW3D_OT_background_image_add(wmOperatorType *ot)
 {
        /* identifiers */
        /* note: having key shortcut here is bad practice,
         * but for now keep because this displays when dragging an image over the 3D viewport */
-       ot->name   = "Add Background Image (Ctrl for Empty Object)";
-       ot->description = "Add a new background image (Ctrl for Empty Object)";
+       ot->name   = "Add Background Image";
+       ot->description = "Add a new background image";
        ot->idname = "VIEW3D_OT_background_image_add";
 
        /* api callbacks */
        ot->invoke = background_image_add_invoke;
        ot->exec   = background_image_add_exec;
-       ot->poll   = ED_operator_view3d_active;
+       ot->poll   = background_image_add_poll;
 
        /* flags */
        ot->flag   = OPTYPE_UNDO;
@@ -4390,21 +4507,21 @@ void VIEW3D_OT_background_image_add(wmOperatorType *ot)
 
 static int background_image_remove_exec(bContext *C, wmOperator *op)
 {
-       View3D *v3d = CTX_wm_view3d(C);
+       Camera *cam = CTX_data_pointer_get_type(C, "camera", &RNA_Camera).data;
        const int index = RNA_int_get(op->ptr, "index");
-       BGpic *bgpic_rem = BLI_findlink(&v3d->bgpicbase, index);
+       CameraBGImage *bgpic_rem = BLI_findlink(&cam->bg_images, index);
 
        if (bgpic_rem) {
-               if (bgpic_rem->source == V3D_BGPIC_IMAGE) {
+               if (bgpic_rem->source == CAM_BGIMG_SOURCE_IMAGE) {
                        id_us_min((ID *)bgpic_rem->ima);
                }
-               else if (bgpic_rem->source == V3D_BGPIC_MOVIE) {
+               else if (bgpic_rem->source == CAM_BGIMG_SOURCE_MOVIE) {
                        id_us_min((ID *)bgpic_rem->clip);
                }
 
-               ED_view3d_background_image_remove(v3d, bgpic_rem);
+               BKE_camera_background_image_remove(cam, bgpic_rem);
 
-               WM_event_add_notifier(C, NC_SPACE | ND_SPACE_VIEW3D, v3d);
+               WM_event_add_notifier(C, NC_CAMERA | ND_DRAW_RENDER_VIEWPORT, cam);
                return OPERATOR_FINISHED;
        }
        else {
@@ -4421,7 +4538,7 @@ void VIEW3D_OT_background_image_remove(wmOperatorType *ot)
 
        /* api callbacks */
        ot->exec   = background_image_remove_exec;
-       ot->poll   = ED_operator_view3d_active;
+       ot->poll   = ED_operator_camera;
 
        /* flags */
        ot->flag   = 0;
@@ -4461,9 +4578,8 @@ void ED_view3d_clipping_local(RegionView3D *rv3d, float mat[4][4])
 
 static int view3d_clipping_exec(bContext *C, wmOperator *op)
 {
+       ARegion *ar = CTX_wm_region(C);
        RegionView3D *rv3d = CTX_wm_region_view3d(C);
-       ViewContext vc;
-       bglMats mats;
        rcti rect;
 
        WM_operator_properties_border_to_rcti(op, &rect);
@@ -4471,12 +4587,8 @@ static int view3d_clipping_exec(bContext *C, wmOperator *op)
        rv3d->rflag |= RV3D_CLIPPING;
        rv3d->clipbb = MEM_callocN(sizeof(BoundBox), "clipbb");
 
-       /* note; otherwise opengl won't work */
-       view3d_operator_needs_opengl(C);
-
-       ED_view3d_viewcontext_init(C, &vc);
-       view3d_get_transformation(vc.ar, vc.rv3d, NULL, &mats); /* NULL because we don't want it in object space */
-       ED_view3d_clipping_calc(rv3d->clipbb, rv3d->clip, &mats, &rect);
+       /* NULL object because we don't want it in object space */
+       ED_view3d_clipping_calc(rv3d->clipbb, rv3d->clip, ar, NULL, &rect);
 
        return OPERATOR_FINISHED;
 }
@@ -4529,10 +4641,8 @@ void VIEW3D_OT_clip_border(wmOperatorType *ot)
 
 /* cursor position in vec, result in vec, mval in region coords */
 /* note: cannot use event->mval here (called by object_add() */
-void ED_view3d_cursor3d_position(bContext *C, const int mval[2], float cursor_co[3])
+void ED_view3d_cursor3d_position(bContext *C, const int mval[2], bool use_depth, float cursor_co[3])
 {
-       Main *bmain = CTX_data_main(C);
-       Scene *scene = CTX_data_scene(C);
        ARegion *ar = CTX_wm_region(C);
        View3D *v3d = CTX_wm_view3d(C);
        RegionView3D *rv3d = ar->regiondata;
@@ -4553,10 +4663,13 @@ void ED_view3d_cursor3d_position(bContext *C, const int mval[2], float cursor_co
                ED_view3d_calc_zfac(rv3d, cursor_co, NULL /* &flip */ );
        }
 
-       if (U.uiflag & USER_DEPTH_CURSOR) {  /* maybe this should be accessed some other way */
+       if (use_depth) {  /* maybe this should be accessed some other way */
+               struct Depsgraph *depsgraph = CTX_data_depsgraph(C);
+
                view3d_operator_needs_opengl(C);
-               if (ED_view3d_autodist(bmain, scene, ar, v3d, mval, cursor_co, true, NULL))
+               if (ED_view3d_autodist(depsgraph, ar, v3d, mval, cursor_co, true, NULL)) {
                        depth_used = true;
+               }
        }
 
        if (depth_used == false) {
@@ -4566,31 +4679,117 @@ void ED_view3d_cursor3d_position(bContext *C, const int mval[2], float cursor_co
        }
 }
 
-void ED_view3d_cursor3d_update(bContext *C, const int mval[2])
+void ED_view3d_cursor3d_position_rotation(
+        bContext *C, const int mval[2],
+        const bool use_depth, enum eV3DCursorOrient orientation,
+        float cursor_co[3], float cursor_quat[4])
 {
+       Main *bmain = CTX_data_main(C);
        Scene *scene = CTX_data_scene(C);
        View3D *v3d = CTX_wm_view3d(C);
+       ARegion *ar = CTX_wm_region(C);
+       RegionView3D *rv3d = ar->regiondata;
+
+       /* XXX, caller should check. */
+       if (rv3d == NULL)
+               return;
+
+       ED_view3d_cursor3d_position(C, mval, use_depth, cursor_co);
+
+       if (orientation == V3D_CURSOR_ORIENT_NONE) {
+               /* pass */
+       }
+       else if (orientation == V3D_CURSOR_ORIENT_VIEW) {
+               copy_qt_qt(cursor_quat, rv3d->viewquat);
+               cursor_quat[0] *= -1.0f;
+       }
+       else if (orientation == V3D_CURSOR_ORIENT_GEOM) {
+               copy_qt_qt(cursor_quat, rv3d->viewquat);
+               cursor_quat[0] *= -1.0f;
+
+               const float mval_fl[2] = {UNPACK2(mval)};
+               float ray_no[3];
+               float ray_co[3];
+
+               struct SnapObjectContext *snap_context = ED_transform_snap_object_context_create_view3d(
+                       bmain, scene, CTX_data_depsgraph(C), 0, ar, v3d);
+
+               float obmat[4][4];
+               Object *ob_dummy = NULL;
+               float dist_px = 0;
+               if (ED_transform_snap_object_project_view3d_ex(
+                       snap_context,
+                       SCE_SNAP_MODE_FACE,
+                       &(const struct SnapObjectParams){
+                           .snap_select = SNAP_ALL,
+                           .use_object_edit_cage = false,
+                       },
+                       mval_fl, &dist_px,
+                       ray_co, ray_no, NULL,
+                       &ob_dummy, obmat))
+               {
+                       if (use_depth) {
+                               copy_v3_v3(cursor_co, ray_co);
+                       }
 
-       float *cursor_co_curr = ED_view3d_cursor3d_get(scene, v3d);
-       float  cursor_co_prev[3];
+                       float tquat[4];
 
-       copy_v3_v3(cursor_co_prev, cursor_co_curr);
+                       /* Math normal (Z). */
+                       {
+                               float z_src[3] = {0, 0, 1};
+                               mul_qt_v3(cursor_quat, z_src);
+                               rotation_between_vecs_to_quat(tquat, z_src, ray_no);
+                               mul_qt_qtqt(cursor_quat, tquat, cursor_quat);
+                       }
 
-       ED_view3d_cursor3d_position(C, mval, cursor_co_curr);
+                       /* Match object matrix (X). */
+                       {
+                               const float ortho_axis_dot[3] = {
+                                       dot_v3v3(ray_no, obmat[0]),
+                                       dot_v3v3(ray_no, obmat[1]),
+                                       dot_v3v3(ray_no, obmat[2]),
+                               };
+                               const int ortho_axis = axis_dominant_v3_ortho_single(ortho_axis_dot);
+                               float x_src[3] = {1, 0, 0};
+                               float x_dst[3];
+                               mul_qt_v3(cursor_quat, x_src);
+                               project_plane_v3_v3v3(x_dst, obmat[ortho_axis], ray_no);
+                               normalize_v3(x_dst);
+                               rotation_between_vecs_to_quat(tquat, x_src, x_dst);
+                               mul_qt_qtqt(cursor_quat, tquat, cursor_quat);
+                       }
+               }
+               ED_transform_snap_object_context_destroy(snap_context);
+       }
+}
+
+void ED_view3d_cursor3d_update(
+        bContext *C, const int mval[2],
+        const bool use_depth, enum eV3DCursorOrient orientation)
+{
+       Scene *scene = CTX_data_scene(C);
+       View3D *v3d = CTX_wm_view3d(C);
+       ARegion *ar = CTX_wm_region(C);
+       RegionView3D *rv3d = ar->regiondata;
+
+       View3DCursor *cursor_curr = ED_view3d_cursor3d_get(scene, v3d);
+       View3DCursor  cursor_prev = *cursor_curr;
+
+       ED_view3d_cursor3d_position_rotation(
+               C, mval,
+               use_depth, orientation,
+               cursor_curr->location, cursor_curr->rotation);
 
        /* offset the cursor lock to avoid jumping to new offset */
        if (v3d->ob_centre_cursor) {
-               ARegion *ar = CTX_wm_region(C);
-               RegionView3D *rv3d = ar->regiondata;
-
                if (U.uiflag & USER_LOCK_CURSOR_ADJUST) {
 
                        float co_2d_curr[2], co_2d_prev[2];
 
                        if ((ED_view3d_project_float_global(
-                                    ar, cursor_co_prev, co_2d_prev, V3D_PROJ_TEST_NOP) == V3D_PROJ_RET_OK) &&
+                                    ar, cursor_prev.location, co_2d_prev, V3D_PROJ_TEST_NOP) == V3D_PROJ_RET_OK) &&
                            (ED_view3d_project_float_global(
-                                   ar, cursor_co_curr, co_2d_curr, V3D_PROJ_TEST_NOP) == V3D_PROJ_RET_OK))
+                                   ar, cursor_curr->location, co_2d_curr, V3D_PROJ_TEST_NOP) == V3D_PROJ_RET_OK))
                        {
                                rv3d->ofs_lock[0] += (co_2d_curr[0] - co_2d_prev[0]) / (ar->winx * 0.5f);
                                rv3d->ofs_lock[1] += (co_2d_curr[1] - co_2d_prev[1]) / (ar->winy * 0.5f);
@@ -4606,11 +4805,30 @@ void ED_view3d_cursor3d_update(bContext *C, const int mval[2])
                WM_event_add_notifier(C, NC_SPACE | ND_SPACE_VIEW3D, v3d);
        else
                WM_event_add_notifier(C, NC_SCENE | NA_EDITED, scene);
+
+       {
+               struct wmMsgBus *mbus = CTX_wm_message_bus(C);
+               WM_msg_publish_rna_prop(
+                       mbus, &scene->id, scene, Scene, cursor_location);
+       }
+
+       DEG_id_tag_update(&scene->id, DEG_TAG_COPY_ON_WRITE);
 }
 
-static int view3d_cursor3d_invoke(bContext *C, wmOperator *UNUSED(op), const wmEvent *event)
+static int view3d_cursor3d_invoke(bContext *C, wmOperator *op, const wmEvent *event)
 {
-       ED_view3d_cursor3d_update(C, event->mval);
+       bool use_depth = (U.uiflag & USER_DEPTH_CURSOR);
+       {
+               PropertyRNA *prop = RNA_struct_find_property(op->ptr, "use_depth");
+               if (RNA_property_is_set(op->ptr, prop)) {
+                       use_depth = RNA_property_boolean_get(op->ptr, prop);
+               }
+               else {
+                       RNA_property_boolean_set(op->ptr, prop, use_depth);
+               }
+       }
+       const enum eV3DCursorOrient orientation = RNA_enum_get(op->ptr, "orientation");
+       ED_view3d_cursor3d_update(C, event->mval, use_depth, orientation);
 
        return OPERATOR_FINISHED;
 }
@@ -4630,129 +4848,100 @@ void VIEW3D_OT_cursor3d(wmOperatorType *ot)
 
        /* flags */
 //     ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO;
-}
-
-/** \} */
-
-/* -------------------------------------------------------------------- */
-/** \name Transform Manipulator Operator
- * \{ */
 
-static int manipulator_invoke(bContext *C, wmOperator *op, const wmEvent *event)
-{
-       View3D *v3d = CTX_wm_view3d(C);
-
-       if (!(v3d->twflag & V3D_USE_MANIPULATOR)) return OPERATOR_PASS_THROUGH;
-       if (!(v3d->twflag & V3D_DRAW_MANIPULATOR)) return OPERATOR_PASS_THROUGH;
-
-       /* note; otherwise opengl won't work */
-       view3d_operator_needs_opengl(C);
-
-       if (BIF_do_manipulator(C, event, op) == 0)
-               return OPERATOR_PASS_THROUGH;
-
-       return OPERATOR_FINISHED;
-}
-
-void VIEW3D_OT_manipulator(wmOperatorType *ot)
-{
        PropertyRNA *prop;
+       static const EnumPropertyItem orientation_items[] = {
+               {V3D_CURSOR_ORIENT_NONE,    "NONE", 0, "None", "Leave orientation unchanged"},
+               {V3D_CURSOR_ORIENT_VIEW,    "VIEW", 0, "View", "Orient to the viewport"},
+               {V3D_CURSOR_ORIENT_GEOM,    "GEOM", 0, "Geometry", "Match the surface normal"},
+               {0, NULL, 0, NULL, NULL}
+       };
 
-       /* identifiers */
-       ot->name = "3D Manipulator";
-       ot->description = "Manipulate selected item by axis";
-       ot->idname = "VIEW3D_OT_manipulator";
-
-       /* api callbacks */
-       ot->invoke = manipulator_invoke;
-
-       ot->poll = ED_operator_view3d_active;
-
-       /* properties to pass to transform */
-       Transform_Properties(ot, P_CONSTRAINT);
+       prop = RNA_def_boolean(
+               ot->srna, "use_depth", true, "Surface Project",
+               "Project onto the surface");
+       RNA_def_property_flag(prop, PROP_SKIP_SAVE);
 
-       prop = RNA_def_boolean(ot->srna, "use_planar_constraint", false, "Planar Constraint", "Limit the transformation to the "
-                              "two axes that have not been clicked (translate/scale only)");
-       RNA_def_property_flag(prop, PROP_SKIP_SAVE | PROP_HIDDEN);
+       prop = RNA_def_enum(
+               ot->srna, "orientation", orientation_items, V3D_CURSOR_ORIENT_VIEW,
+               "Orientation", "Preset viewpoint to use");
+       RNA_def_property_flag(prop, PROP_SKIP_SAVE);
 }
 
 /** \} */
 
 /* -------------------------------------------------------------------- */
-/** \name Enable Transform Manipulator Operator
+/** \name Toggle Shading Operator
  * \{ */
 
-static int enable_manipulator_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(event))
+static const EnumPropertyItem prop_shading_type_items[] = {
+       {OB_SOLID, "SOLID", 0, "Solid and X-Ray", "Toggle solid and X-ray shading"},
+       {OB_MATERIAL, "MATERIAL", 0, "LookDev", "Toggle lookdev shading"},
+       {OB_RENDER, "RENDERED", 0, "Rendered", "Toggle rendered shading"},
+       {0, NULL, 0, NULL, NULL}
+};
+
+static int toggle_shading_exec(bContext *C, wmOperator *op)
 {
+       Main *bmain = CTX_data_main(C);
        View3D *v3d = CTX_wm_view3d(C);
+       ScrArea *sa = CTX_wm_area(C);
+       int type = RNA_enum_get(op->ptr, "type");
 
-       v3d->twtype = 0;
-
-       if (RNA_boolean_get(op->ptr, "translate"))
-               v3d->twtype |= V3D_MANIP_TRANSLATE;
-       if (RNA_boolean_get(op->ptr, "rotate"))
-               v3d->twtype |= V3D_MANIP_ROTATE;
-       if (RNA_boolean_get(op->ptr, "scale"))
-               v3d->twtype |= V3D_MANIP_SCALE;
+       if (type == OB_SOLID) {
+               if (v3d->drawtype == OB_SOLID) {
+                       /* Toggle X-Ray if already in solid mode. */
+                       if (ED_operator_posemode(C) || ED_operator_editmesh(C)) {
+                               v3d->flag ^= V3D_ZBUF_SELECT;
+                       }
+                       else {
+                               v3d->shading.flag ^= V3D_SHADING_XRAY;
+                       }
+               }
+               else {
+                       /* Go to solid mode. */
+                       v3d->drawtype = OB_SOLID;
+               }
+       }
+       else if (type == OB_MATERIAL) {
+               if (v3d->drawtype == OB_MATERIAL) {
+                       v3d->drawtype = OB_SOLID;
+               }
+               else {
+                       v3d->drawtype = OB_MATERIAL;
+               }
+       }
+       else if (type == OB_RENDER) {
+               if (v3d->drawtype == OB_RENDER) {
+                       v3d->drawtype = v3d->prev_drawtype;
+               }
+               else {
+                       v3d->prev_drawtype = v3d->drawtype;
+                       v3d->drawtype = OB_RENDER;
+               }
+       }
 
+       ED_view3d_shade_update(bmain, v3d, sa);
        WM_event_add_notifier(C, NC_SPACE | ND_SPACE_VIEW3D, v3d);
 
        return OPERATOR_FINISHED;
 }
 
-void VIEW3D_OT_enable_manipulator(wmOperatorType *ot)
+void VIEW3D_OT_toggle_shading(wmOperatorType *ot)
 {
        PropertyRNA *prop;
 
        /* identifiers */
-       ot->name = "Enable 3D Manipulator";
-       ot->description = "Enable the transform manipulator for use";
-       ot->idname = "VIEW3D_OT_enable_manipulator";
+       ot->name = "Toggle Shading Type";
+       ot->description = "Toggle shading type in 3D viewport";
+       ot->idname = "VIEW3D_OT_toggle_shading";
 
        /* api callbacks */
-       ot->invoke = enable_manipulator_invoke;
+       ot->exec = toggle_shading_exec;
        ot->poll = ED_operator_view3d_active;
 
-       /* properties */
-       prop = RNA_def_boolean(ot->srna, "translate", 0, "Translate", "Enable the translate manipulator");
-       RNA_def_property_flag(prop, PROP_SKIP_SAVE);
-       prop = RNA_def_boolean(ot->srna, "rotate", 0, "Rotate", "Enable the rotate manipulator");
-       RNA_def_property_flag(prop, PROP_SKIP_SAVE);
-       prop = RNA_def_boolean(ot->srna, "scale", 0, "Scale", "Enable the scale manipulator");
+       prop = RNA_def_enum(ot->srna, "type", prop_shading_type_items, 0, "Type", "Shading type to toggle");
        RNA_def_property_flag(prop, PROP_SKIP_SAVE);
 }
 
 /** \} */
-
-/* -------------------------------------------------------------------- */
-/** \name Toggle Render Shading Operator
- * \{ */
-
-static int toggle_render_exec(bContext *C, wmOperator *UNUSED(op))
-{
-       View3D *v3d = CTX_wm_view3d(C);
-       if (v3d->drawtype == OB_RENDER) {
-               v3d->drawtype = v3d->prev_drawtype;
-       }
-       else {
-               v3d->prev_drawtype = v3d->drawtype;
-               v3d->drawtype = OB_RENDER;
-       }
-       ED_view3d_shade_update(CTX_data_main(C), v3d, CTX_wm_area(C));
-       WM_event_add_notifier(C, NC_SPACE | ND_SPACE_VIEW3D, v3d);
-       return OPERATOR_FINISHED;
-}
-
-void VIEW3D_OT_toggle_render(wmOperatorType *ot)
-{
-       /* identifiers */
-       ot->name = "Toggle Rendered Shading";
-       ot->description = "Toggle rendered shading mode of the viewport";
-       ot->idname = "VIEW3D_OT_toggle_render";
-
-       /* api callbacks */
-       ot->exec = toggle_render_exec;
-       ot->poll = ED_operator_view3d_active;
-}
-
-/** \} */