diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-07-13 19:17:07 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-07-13 19:17:46 +0300 |
| commit | 6f7926c61c94ea9bd2969ebfcc7e09994ffe901d (patch) | |
| tree | 742e90213eb15a0cb5297775db0b173c632b56cb /source/blender/blenkernel/intern/tracking.c | |
| parent | dd44754c5ff3b2f200f5bb256ac9868eb43a65f6 (diff) | |
Fix T45394: Motion tracking constraints did not work with Cycles motion blur
Diffstat (limited to 'source/blender/blenkernel/intern/tracking.c')
| -rw-r--r-- | source/blender/blenkernel/intern/tracking.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/tracking.c b/source/blender/blenkernel/intern/tracking.c index f9ae987db70..c5ccaa63992 100644 --- a/source/blender/blenkernel/intern/tracking.c +++ b/source/blender/blenkernel/intern/tracking.c @@ -1822,7 +1822,7 @@ MovieReconstructedCamera *BKE_tracking_camera_get_reconstructed(MovieTracking *t } void BKE_tracking_camera_get_reconstructed_interpolate(MovieTracking *tracking, MovieTrackingObject *object, - int framenr, float mat[4][4]) + float framenr, float mat[4][4]) { MovieTrackingReconstruction *reconstruction; MovieReconstructedCamera *cameras; @@ -1830,17 +1830,15 @@ void BKE_tracking_camera_get_reconstructed_interpolate(MovieTracking *tracking, reconstruction = BKE_tracking_object_get_reconstruction(tracking, object); cameras = reconstruction->cameras; - a = reconstructed_camera_index_get(reconstruction, framenr, true); + a = reconstructed_camera_index_get(reconstruction, (int)framenr, true); if (a == -1) { unit_m4(mat); - return; } - if (cameras[a].framenr != framenr && a > 0 && a < reconstruction->camnr - 1) { + if (cameras[a].framenr != framenr && a < reconstruction->camnr - 1) { float t = ((float)framenr - cameras[a].framenr) / (cameras[a + 1].framenr - cameras[a].framenr); - blend_m4_m4m4(mat, cameras[a].mat, cameras[a + 1].mat, t); } else { |