diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-02-04 12:45:22 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-02-04 12:45:22 +0400 |
| commit | bb36037c1561c3c3d7a61fac885b01408201fe0e (patch) | |
| tree | 0e2009a11f20f8fd942c6f0f5bdfc1b4a225227e /source/blender/editors/space_view3d/view3d_edit.c | |
| parent | 6a2c467443f9d6d47fc9727457459a8ed92f1961 (diff) | |
Fix T38472: allow orbiting locked view when they are already 'user'.
Diffstat (limited to 'source/blender/editors/space_view3d/view3d_edit.c')
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_edit.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c index 7d37326740c..cf9668608e7 100644 --- a/source/blender/editors/space_view3d/view3d_edit.c +++ b/source/blender/editors/space_view3d/view3d_edit.c @@ -985,7 +985,8 @@ static int viewrotate_invoke(bContext *C, wmOperator *op, const wmEvent *event) viewops_data_create(C, op, event); vod = op->customdata; - if (vod->rv3d->viewlock) { /* poll should check but in some cases fails, see poll func for details */ + /* poll should check but in some cases fails, see poll func for details */ + if (vod->rv3d->viewlock && RV3D_VIEW_IS_AXIS(vod->rv3d->view)) { viewops_data_free(C, op); return OPERATOR_PASS_THROUGH; } |