[Bf-blender-cvs] [1d34f0f] master: Smooth-view: Ignored camera-viewpoint on exit to user-view
Campbell Barton
noreply at git.blender.org
Wed Aug 26 07:21:31 CEST 2015
Commit: 1d34f0feede65460d564e4f0cf17f73007e102f2
Author: Campbell Barton
Date: Wed Aug 26 15:13:19 2015 +1000
Branches: master
https://developer.blender.org/rB1d34f0feede65460d564e4f0cf17f73007e102f2
Smooth-view: Ignored camera-viewpoint on exit to user-view
===================================================================
M source/blender/editors/space_view3d/view3d_edit.c
===================================================================
diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c
index dd82e66..3fc415e 100644
--- a/source/blender/editors/space_view3d/view3d_edit.c
+++ b/source/blender/editors/space_view3d/view3d_edit.c
@@ -3815,8 +3815,16 @@ static void axis_set_view(bContext *C, View3D *v3d, ARegion *ar,
smooth_viewtx);
}
else {
+ float ofs[3], dist;
+
+ copy_v3_v3(ofs, rv3d->ofs);
+ dist = rv3d->dist;
+
+ /* so we animate _from_ the camera location */
+ ED_view3d_from_object(v3d->camera, rv3d->ofs, NULL, &rv3d->dist, NULL);
+
ED_view3d_smooth_view(C, v3d, ar, NULL, NULL,
- NULL, quat, NULL, NULL,
+ ofs, quat, &dist, NULL,
smooth_viewtx);
}
More information about the Bf-blender-cvs
mailing list