Revision: 39049
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39049
Author: nazgul
Date: 2011-08-05 06:43:20 +0000 (Fri, 05 Aug 2011)
Log Message:
-----------
Camera tracking integration
===========================
- Cleanup wouldn't affect on hidden or locked tracks.
- "Track" operator wouldn't take locked tracks into account
when checking if there's something to track.
Modified Paths:
--------------
branches/soc-2011-tomato/source/blender/editors/space_clip/tracking_ops.c
Modified:
branches/soc-2011-tomato/source/blender/editors/space_clip/tracking_ops.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/space_clip/tracking_ops.c
2011-08-05 06:26:54 UTC (rev 39048)
+++ branches/soc-2011-tomato/source/blender/editors/space_clip/tracking_ops.c
2011-08-05 06:43:20 UTC (rev 39049)
@@ -1171,7 +1171,7 @@
track= clip->tracking.tracks.first;
while(track) {
- if(TRACK_VIEW_SELECTED(sc, track))
+ if(TRACK_VIEW_SELECTED(sc, track) &&
(track->flag&TRACK_LOCKED)==0)
tot++;
track= track->next;
@@ -2714,31 +2714,33 @@
track= tracking->tracks.first;
while(track) {
- int ok= 1;
- next= track->next;
+ if((track->flag&TRACK_HIDDEN)==0 &&
(track->flag&TRACK_LOCKED)==0) {
+ int ok= 1;
+ next= track->next;
- ok&= is_track_clean(track, frames, action==2);
- ok&= error == 0.f || (track->flag&TRACK_HAS_BUNDLE)==0 ||
track->error < error;
+ ok&= is_track_clean(track, frames, action==2);
+ ok&= error == 0.f || (track->flag&TRACK_HAS_BUNDLE)==0
|| track->error < error;
- if(!ok) {
- if(action==0) { /* select */
- BKE_tracking_track_flag(track, TRACK_AREA_ALL,
SELECT, 0);
- }
- else if(action==1) { /* delete track */
- if(track==sel_track)
- BKE_movieclip_set_selection(clip,
MCLIP_SEL_NONE, NULL);
+ if(!ok) {
+ if(action==0) { /* select */
+ BKE_tracking_track_flag(track,
TRACK_AREA_ALL, SELECT, 0);
+ }
+ else if(action==1) { /* delete track */
+ if(track==sel_track)
+
BKE_movieclip_set_selection(clip, MCLIP_SEL_NONE, NULL);
- BKE_tracking_free_track(track);
- BLI_freelinkN(&clip->tracking.tracks, track);
- }
+ BKE_tracking_free_track(track);
+ BLI_freelinkN(&clip->tracking.tracks,
track);
+ }
- /* happens when all tracking segments are not long
enough */
- if(track->markersnr==0) {
- if(track==sel_track)
- BKE_movieclip_set_selection(clip,
MCLIP_SEL_NONE, NULL);
+ /* happens when all tracking segments are not
long enough */
+ if(track->markersnr==0) {
+ if(track==sel_track)
+
BKE_movieclip_set_selection(clip, MCLIP_SEL_NONE, NULL);
- BKE_tracking_free_track(track);
- BLI_freelinkN(&clip->tracking.tracks, track);
+ BKE_tracking_free_track(track);
+ BLI_freelinkN(&clip->tracking.tracks,
track);
+ }
}
}
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
