diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-09-07 13:15:59 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-09-07 13:15:59 +0400 |
| commit | ea95d71067ec3abc392d69321c35dd1b78b65712 (patch) | |
| tree | 35f610c7d02a8624c77df04743aef5fe8a86a0a5 /source/blender/editors/space_view3d/view3d_edit.c | |
| parent | db775721c84f3befd994908a731a24ea9f868e4f (diff) | |
bugfix [#23189] Num-0 swtich to Camera view and back doesn't respect UserPerspective view.
also fix for recent cmake edits.
Diffstat (limited to 'source/blender/editors/space_view3d/view3d_edit.c')
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_edit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c index c2770d2eb8c..3614717e9e0 100644 --- a/source/blender/editors/space_view3d/view3d_edit.c +++ b/source/blender/editors/space_view3d/view3d_edit.c @@ -1902,14 +1902,14 @@ static void axis_set_view(bContext *C, float q1, float q2, float q3, float q4, s if (rv3d->persp==RV3D_CAMOB && v3d->camera) { - if (U.uiflag & USER_AUTOPERSP) rv3d->persp= RV3D_ORTHO; + if (U.uiflag & USER_AUTOPERSP) rv3d->persp= view ? RV3D_ORTHO : RV3D_PERSP; else if(rv3d->persp==RV3D_CAMOB) rv3d->persp= perspo; smooth_view(C, v3d->camera, NULL, rv3d->ofs, new_quat, NULL, NULL); } else { - if (U.uiflag & USER_AUTOPERSP) rv3d->persp= RV3D_ORTHO; + if (U.uiflag & USER_AUTOPERSP) rv3d->persp= view ? RV3D_ORTHO : RV3D_PERSP; else if(rv3d->persp==RV3D_CAMOB) rv3d->persp= perspo; smooth_view(C, NULL, NULL, NULL, new_quat, NULL, NULL); |