Revision: 26389
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26389
Author: broken
Date: 2010-01-29 07:43:13 +0100 (Fri, 29 Jan 2010)
Log Message:
-----------
Fix [#19579] View not behaving proper;y when pressing camera view toggle while
view is moving
Modified Paths:
--------------
trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
2010-01-29 05:48:47 UTC (rev 26388)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
2010-01-29 06:43:13 UTC (rev 26389)
@@ -1852,11 +1852,15 @@
/* 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) {
if(oldcamera &&
is_an_active_object(oldcamera)) {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
