diff options
Diffstat (limited to 'source/blender/editors/space_view3d/view3d_edit.c')
-rw-r--r-- | source/blender/editors/space_view3d/view3d_edit.c | 38 |
1 files changed, 33 insertions, 5 deletions
diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c index 4043a86eb44..51915e05a9e 100644 --- a/source/blender/editors/space_view3d/view3d_edit.c +++ b/source/blender/editors/space_view3d/view3d_edit.c @@ -3874,23 +3874,37 @@ static int vieworbit_exec(bContext *C, wmOperator *op) ARegion *ar; RegionView3D *rv3d; int orbitdir; + char view_opposite; + PropertyRNA *prop_angle = RNA_struct_find_property(op->ptr, "angle"); + float angle = RNA_property_is_set(op->ptr, prop_angle) ? + RNA_property_float_get(op->ptr, prop_angle) : DEG2RADF((float)U.pad_rot_angle); /* no NULL check is needed, poll checks */ - ED_view3d_context_user_region(C, &v3d, &ar); + v3d = CTX_wm_view3d(C); + ar = CTX_wm_region(C); rv3d = ar->regiondata; + /* support for switching to the opposite view (even when in locked views) */ + view_opposite = (fabsf(angle) == (float)M_PI) ? ED_view3d_axis_view_opposite(rv3d->view) : RV3D_VIEW_USER; orbitdir = RNA_enum_get(op->ptr, "type"); - if ((rv3d->viewlock & RV3D_LOCKED) == 0) { + if ((rv3d->viewlock & RV3D_LOCKED) && (view_opposite == RV3D_VIEW_USER)) { + /* no NULL check is needed, poll checks */ + ED_view3d_context_user_region(C, &v3d, &ar); + rv3d = ar->regiondata; + } + + if ((rv3d->viewlock & RV3D_LOCKED) == 0 || (view_opposite != RV3D_VIEW_USER)) { if ((rv3d->persp != RV3D_CAMOB) || ED_view3d_camera_lock_check(v3d, rv3d)) { int smooth_viewtx = WM_operator_smooth_viewtx_get(op); - float angle = DEG2RADF((float)U.pad_rot_angle); float quat_mul[4]; float quat_new[4]; float ofs_new[3]; float *ofs_new_pt = NULL; - view3d_ensure_persp(v3d, ar); + if (view_opposite == RV3D_VIEW_USER) { + view3d_ensure_persp(v3d, ar); + } if (ELEM(orbitdir, V3D_VIEW_STEPLEFT, V3D_VIEW_STEPRIGHT)) { const float zvec[3] = {0.0f, 0.0f, 1.0f}; @@ -3913,7 +3927,15 @@ static int vieworbit_exec(bContext *C, wmOperator *op) } mul_qt_qtqt(quat_new, rv3d->viewquat, quat_mul); - rv3d->view = RV3D_VIEW_USER; + + if (view_opposite != RV3D_VIEW_USER) { + rv3d->view = view_opposite; + /* avoid float in-precision, just get a new orientation */ + ED_view3d_quat_from_axis_view(view_opposite, quat_new); + } + else { + rv3d->view = RV3D_VIEW_USER; + } if (U.uiflag & USER_ORBIT_SELECTION) { float dyn_ofs[3]; @@ -3944,6 +3966,8 @@ static int vieworbit_exec(bContext *C, wmOperator *op) void VIEW3D_OT_view_orbit(wmOperatorType *ot) { + PropertyRNA *prop; + /* identifiers */ ot->name = "View Orbit"; ot->description = "Orbit the view"; @@ -3957,7 +3981,11 @@ void VIEW3D_OT_view_orbit(wmOperatorType *ot) ot->flag = 0; /* properties */ + prop = RNA_def_float(ot->srna, "angle", 0, -FLT_MAX, FLT_MAX, "Roll", "", -FLT_MAX, FLT_MAX); + RNA_def_property_flag(prop, PROP_SKIP_SAVE); + ot->prop = RNA_def_enum(ot->srna, "type", prop_view_orbit_items, 0, "Orbit", "Direction of View Orbit"); + } |