diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-05-23 06:23:03 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-05-23 06:23:03 +0400 |
| commit | 0d26333eb502d9a25e0b82aa5b5276b4767a08f0 (patch) | |
| tree | f8f9d28e53e3ad1d19445f6836c74c41b042250f /source/blender/editors/space_view3d/view3d_fly.c | |
| parent | bf65ed94472ea66983081bdbacac5d1f11feb68c (diff) | |
fix view3d_persp_mat4, which gave incorrect translation, rename to ED_view3d_to_m4. added doxygen docs.
Diffstat (limited to 'source/blender/editors/space_view3d/view3d_fly.c')
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_fly.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/space_view3d/view3d_fly.c b/source/blender/editors/space_view3d/view3d_fly.c index 962bd5c7080..e140ec39bf3 100644 --- a/source/blender/editors/space_view3d/view3d_fly.c +++ b/source/blender/editors/space_view3d/view3d_fly.c @@ -568,7 +568,7 @@ static int flyApply(bContext *C, FlyInfo *fly) apply_rotation= 1; /* if the user presses shift they can look about without movinf the direction there looking*/ if(fly->root_parent) - view3d_persp_mat4(rv3d, prev_view_mat); + ED_view3d_to_m4(prev_view_mat, fly->rv3d->ofs, fly->rv3d->viewquat, fly->rv3d->dist); /* the dist defines a vector that is infront of the offset to rotate the view about. @@ -797,7 +797,7 @@ static int flyApply(bContext *C, FlyInfo *fly) float parent_mat[4][4]; invert_m4_m4(prev_view_imat, prev_view_mat); - view3d_persp_mat4(rv3d, view_mat); + ED_view3d_to_m4(view_mat, rv3d->ofs, rv3d->viewquat, rv3d->dist); mul_m4_m4m4(diff_mat, prev_view_imat, view_mat); mul_m4_m4m4(parent_mat, fly->root_parent->obmat, diff_mat); object_apply_mat4(fly->root_parent, parent_mat, TRUE, FALSE); @@ -817,7 +817,7 @@ static int flyApply(bContext *C, FlyInfo *fly) } else { float view_mat[4][4]; - view3d_persp_mat4(rv3d, view_mat); + ED_view3d_to_m4(view_mat, rv3d->ofs, rv3d->viewquat, rv3d->dist); object_apply_mat4(v3d->camera, view_mat, TRUE, FALSE); id_key= &v3d->camera->id; } |