diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-05-26 22:36:25 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-05-26 22:36:25 +0400 |
commit | ec8d277c64346770b99716b3c1bbdcd07eae26f6 (patch) | |
tree | e0fc551f658e2585d0ea1c36b8d3e2c373919ef2 /source/blender/editors/space_view3d/view3d_fly.c | |
parent | 4cf069a41d0a3c39a39237656cd7e65be1d37924 (diff) |
BLI_math rename functions:
- mult_m4_m4m4 -> mul_m4_m4m4
- mult_m3_m3m4 -> mul_m3_m3m4
these temporary names were used to avoid problems when argument order was switched.
Diffstat (limited to 'source/blender/editors/space_view3d/view3d_fly.c')
-rw-r--r-- | source/blender/editors/space_view3d/view3d_fly.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/space_view3d/view3d_fly.c b/source/blender/editors/space_view3d/view3d_fly.c index 4c267905834..5957f743665 100644 --- a/source/blender/editors/space_view3d/view3d_fly.c +++ b/source/blender/editors/space_view3d/view3d_fly.c @@ -740,11 +740,11 @@ static void flyMoveCamera(bContext *C, RegionView3D *rv3d, FlyInfo *fly, ED_view3d_to_m4(prev_view_mat, fly->rv3d->ofs, fly->rv3d->viewquat, fly->rv3d->dist); invert_m4_m4(prev_view_imat, prev_view_mat); ED_view3d_to_m4(view_mat, rv3d->ofs, rv3d->viewquat, rv3d->dist); - mult_m4_m4m4(diff_mat, view_mat, prev_view_imat); - mult_m4_m4m4(parent_mat, diff_mat, fly->root_parent->obmat); + mul_m4_m4m4(diff_mat, view_mat, prev_view_imat); + mul_m4_m4m4(parent_mat, diff_mat, fly->root_parent->obmat); size_to_mat4(size_mat, fly->root_parent->size); - mult_m4_m4m4(parent_mat, parent_mat, size_mat); + mul_m4_m4m4(parent_mat, parent_mat, size_mat); BKE_object_apply_mat4(fly->root_parent, parent_mat, true, false); @@ -764,7 +764,7 @@ static void flyMoveCamera(bContext *C, RegionView3D *rv3d, FlyInfo *fly, ED_view3d_to_m4(view_mat, rv3d->ofs, rv3d->viewquat, rv3d->dist); size_to_mat4(size_mat, v3d->camera->size); - mult_m4_m4m4(view_mat, view_mat, size_mat); + mul_m4_m4m4(view_mat, view_mat, size_mat); BKE_object_apply_mat4(v3d->camera, view_mat, true, false); |