diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-12-19 14:39:40 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-12-19 14:39:40 +0400 |
| commit | 737648a0bf6aa38707adf0d444902cab981f86cf (patch) | |
| tree | 9911809833f690eec95ef9e259729d29160d7a02 /source/blender/editors/space_view3d/view3d_snap.c | |
| parent | 5d15d8d2eebc98d7122e811dae2979b9a6c38b9d (diff) | |
| parent | 90ef435145416313596cafa6f8c4c6c6aebe4e44 (diff) | |
Merging r42648 through r42722 from trunk into soc-2011-tomato
Diffstat (limited to 'source/blender/editors/space_view3d/view3d_snap.c')
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_snap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/space_view3d/view3d_snap.c b/source/blender/editors/space_view3d/view3d_snap.c index db33426a804..a2173537c8c 100644 --- a/source/blender/editors/space_view3d/view3d_snap.c +++ b/source/blender/editors/space_view3d/view3d_snap.c @@ -792,7 +792,7 @@ static void bundle_midpoint(Scene *scene, Object *ob, float vec[3]) BKE_tracking_get_interpolated_camera(tracking, object, scene->r.cfra, imat); invert_m4(imat); - mul_m4_m4m4(obmat, imat, cammat); + mult_m4_m4m4(obmat, cammat, imat); } while(track) { |