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/blenkernel/intern/tracking.c | |
| parent | 5d15d8d2eebc98d7122e811dae2979b9a6c38b9d (diff) | |
| parent | 90ef435145416313596cafa6f8c4c6c6aebe4e44 (diff) | |
Merging r42648 through r42722 from trunk into soc-2011-tomato
Diffstat (limited to 'source/blender/blenkernel/intern/tracking.c')
| -rw-r--r-- | source/blender/blenkernel/intern/tracking.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/tracking.c b/source/blender/blenkernel/intern/tracking.c index 262c0576186..06680dc9da4 100644 --- a/source/blender/blenkernel/intern/tracking.c +++ b/source/blender/blenkernel/intern/tracking.c @@ -1228,7 +1228,7 @@ int BKE_tracking_next(MovieTrackingContext *context) #pragma omp parallel for private(a) shared(ibuf_new, ok) if(map_size>1) for(a= 0; a<map_size; a++) { - TrackContext *track_context; + TrackContext *track_context = NULL; MovieTrackingTrack *track; MovieTrackingMarker *marker; @@ -1572,7 +1572,7 @@ static int retrieve_libmv_reconstruct_tracks(MovieReconstructContext *context, M } if(origin_set) - mul_m4_m4m4(mat, mat, imat); + mult_m4_m4m4(mat, imat, mat); copy_m4_m4(reconstructed[reconstruction->camnr].mat, mat); reconstructed[reconstruction->camnr].framenr= a; @@ -2036,7 +2036,7 @@ void BKE_tracking_projection_matrix(MovieTracking *tracking, MovieTrackingObject float imat[4][4]; invert_m4_m4(imat, camera->mat); - mul_m4_m4m4(mat, imat, winmat); + mult_m4_m4m4(mat, winmat, imat); } else copy_m4_m4(mat, winmat); } |