[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51694] trunk/blender/source/blender/ editors/space_view3d/view3d_fly.c: Bugfix #32823 (probably) or from Thomas Dinges in irc:

[Ton Roosendaal]

Revision: 51694
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51694
Author:   ton
Date:     2012-10-27 17:21:21 +0000 (Sat, 27 Oct 2012)
Log Message:
-----------
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 ;)

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_view3d/view3d_fly.c

Modified: trunk/blender/source/blender/editors/space_view3d/view3d_fly.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_fly.c	2012-10-27 17:19:55 UTC (rev 51693)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_fly.c	2012-10-27 17:21:21 UTC (rev 51694)
@@ -426,7 +426,7 @@
 	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 @@
 		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 */