griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Camera solving: fixed incorrect warnings about failure of solving some frames

Browse Source 
Error was caused y not very accurate calculating which frames should be solved.
This commit is contained in:
Sergey Sharybin
2011-11-13 17:16:04 +00:00
parent b9cc1f7590
commit 3689830484
1 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
source/blender/blenkernel/intern/tracking.c
View File

@@ -1289,8 +1289,27 @@ static int retrieve_libmv_reconstruct(MovieTracking *tracking, struct libmv_Reco
}
if(track->markersnr) {
if(track->markers[0].framenr<sfra) sfra= track->markers[0].framenr;
if(track->markers[track->markersnr-1].framenr>efra) efra= track->markers[track->markersnr-1].framenr;
int first= 0, last= track->markersnr;
MovieTrackingMarker *first_marker= &track->markers[0];
MovieTrackingMarker *last_marker= &track->markers[track->markersnr-1];
/* find first not-disabled marker */
while(first<track->markersnr-1 && first_marker->flag&MARKER_DISABLED) {
first++;
first_marker++;
}
/* find last not-disabled marker */
while(last>=0 && last_marker->flag&MARKER_DISABLED) {
last--;
last_marker--;
}
if(first<track->markersnr-1)
sfra= MIN2(sfra, first_marker->framenr);
if(last>=0)
efra= MAX2(efra, last_marker->framenr);
}
track= track->next;