diff options
author | Ton Roosendaal <ton@blender.org> | 2012-10-27 21:21:21 +0400 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2012-10-27 21:21:21 +0400 |
commit | 3f88ca0d80150707e4be5b606ca54807a4f84b5e (patch) | |
tree | e7e075bcbe025e17a40216ef8da816b0fef41a93 /source | |
parent | c64fa6a344981476dc5ebd85e6e7d83c5b8221aa (diff) |
Bugfix #32823 (probably) or from Thomas Dinges in irc:
- Camera mode fly a bit
- Apply view change
- Middlemouse to go out of camera view
Zoom then fails. Appears the flymode is resetting values that have to be set.
The bugreporter claims same, but blames it on particles ;)
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/editors/space_view3d/view3d_fly.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/source/blender/editors/space_view3d/view3d_fly.c b/source/blender/editors/space_view3d/view3d_fly.c index da30ae61879..98588440e50 100644 --- a/source/blender/editors/space_view3d/view3d_fly.c +++ b/source/blender/editors/space_view3d/view3d_fly.c @@ -426,7 +426,7 @@ static int flyEnd(bContext *C, FlyInfo *fly) ED_region_draw_cb_exit(fly->ar->type, fly->draw_handle_pixel); rv3d->dist = fly->dist_backup; - + printf("dist %f\n", rv3d->dist); if (fly->state == FLY_CANCEL) { /* Revert to original view? */ if (fly->persp_backup == RV3D_CAMOB) { /* a camera view */ @@ -441,12 +441,16 @@ static int flyEnd(bContext *C, FlyInfo *fly) else { /* Non Camera we need to reset the view back to the original location bacause the user canceled*/ copy_qt_qt(rv3d->viewquat, fly->rot_backup); - copy_v3_v3(rv3d->ofs, fly->ofs_backup); rv3d->persp = fly->persp_backup; } + /* always, is set to zero otherwise */ + copy_v3_v3(rv3d->ofs, fly->ofs_backup); } else if (fly->persp_backup == RV3D_CAMOB) { /* camera */ DAG_id_tag_update(fly->root_parent ? &fly->root_parent->id : &v3d->camera->id, OB_RECALC_OB); + + /* always, is set to zero otherwise */ + copy_v3_v3(rv3d->ofs, fly->ofs_backup); } else { /* not camera */ |