diff options
| author | Matt Ebb <matt@mke3.net> | 2010-01-29 09:43:13 +0300 |
|---|---|---|
| committer | Matt Ebb <matt@mke3.net> | 2010-01-29 09:43:13 +0300 |
| commit | 88ae9b121e2899779fb8e52161778f99b44402b5 (patch) | |
| tree | 21b40ae03783a0774baf9237473231b2fe67202a /source/blender/editors/space_view3d | |
| parent | 6d71a19e89ff5615ecf9793aaed0b3523acba059 (diff) | |
Fix [#19579] View not behaving proper;y when pressing camera view toggle while view is moving
Diffstat (limited to 'source/blender/editors/space_view3d')
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_edit.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c index 7f1d30bddd3..1196ea73f54 100644 --- a/source/blender/editors/space_view3d/view3d_edit.c +++ b/source/blender/editors/space_view3d/view3d_edit.c @@ -1852,10 +1852,14 @@ static int viewnumpad_exec(bContext *C, wmOperator *op) /* lastview - */ if(rv3d->persp != RV3D_CAMOB) { - /* store settings of current view before allowing overwriting with camera view */ - QUATCOPY(rv3d->lviewquat, rv3d->viewquat); - rv3d->lview= rv3d->view; - rv3d->lpersp= 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 */ + QUATCOPY(rv3d->lviewquat, rv3d->viewquat); + rv3d->lview= rv3d->view; + rv3d->lpersp= rv3d->persp; + } #if 0 if(G.qual==LR_ALTKEY) { |