[Bf-blender-cvs] [8179a28] master: Tracking: Cleanup, de-duplicate some code

[Sergey Sharybin]

Commit: 8179a287d436982b8ca6d27ac3b34fa739872599
Author: Sergey Sharybin
Date:   Wed Jan 27 14:06:55 2016 +0100
Branches: master
https://developer.blender.org/rB8179a287d436982b8ca6d27ac3b34fa739872599

Tracking: Cleanup, de-duplicate some code

===================================================================

M	source/blender/editors/space_clip/tracking_ops_detect.c
M	source/blender/editors/space_clip/tracking_ops_intern.h
M	source/blender/editors/space_clip/tracking_select.c

===================================================================

diff --git a/source/blender/editors/space_clip/tracking_ops_detect.c b/source/blender/editors/space_clip/tracking_ops_detect.c
index 1af6bbe..992c347 100644
--- a/source/blender/editors/space_clip/tracking_ops_detect.c
+++ b/source/blender/editors/space_clip/tracking_ops_detect.c
@@ -54,6 +54,7 @@
 #include "RNA_define.h"
 
 #include "clip_intern.h"
+#include "tracking_ops_intern.h"
 
 /********************** detect features operator *********************/
 
@@ -105,16 +106,8 @@ static int detect_features_exec(bContext *C, wmOperator *op)
 	}
 
 	/* Deselect existing tracks. */
-	/* TODO(sergey): Could use deselect oeprator function for this. */
-	for (MovieTrackingTrack *track = tracksbase->first;
-	     track != NULL;
-	     track = track->next)
-	{
-		track->flag &= ~SELECT;
-		track->pat_flag &= ~SELECT;
-		track->search_flag &= ~SELECT;
-	}
-
+	ed_tracking_delect_all_tracks(tracksbase);
+	/* Run detector. */
 	BKE_tracking_detect_harris(tracking,
 	                           tracksbase,
 	                           ibuf,
diff --git a/source/blender/editors/space_clip/tracking_ops_intern.h b/source/blender/editors/space_clip/tracking_ops_intern.h
index 36af428..6ac9287 100644
--- a/source/blender/editors/space_clip/tracking_ops_intern.h
+++ b/source/blender/editors/space_clip/tracking_ops_intern.h
@@ -33,8 +33,11 @@
 #define __TRACKING_OPS_INTERN_H__
 
 struct bContext;
-struct SpaceClip;
+struct ListBase;
 struct MovieClip;
+struct SpaceClip;
+
+/* tracking_utils.c */
 
 void clip_tracking_clear_invisible_track_selection(struct SpaceClip *sc,
                                                    struct MovieClip *clip);
@@ -42,4 +45,9 @@ void clip_tracking_clear_invisible_track_selection(struct SpaceClip *sc,
 void clip_tracking_show_cursor(struct bContext *C);
 void clip_tracking_hide_cursor(struct bContext *C);
 
+/* tracking_select.h */
+
+void ed_tracking_delect_all_tracks(struct ListBase *tracks_base);
+void ed_tracking_delect_all_plane_tracks(struct ListBase *plane_tracks_base);
+
 #endif /* __TRACKING_OPS_INTERN_H__ */
\ No newline at end of file
diff --git a/source/blender/editors/space_clip/tracking_select.c b/source/blender/editors/space_clip/tracking_select.c
index 8a2bf17..b9b53a5 100644
--- a/source/blender/editors/space_clip/tracking_select.c
+++ b/source/blender/editors/space_clip/tracking_select.c
@@ -244,22 +244,22 @@ static MovieTrackingPlaneTrack *find_nearest_plane_track(SpaceClip *sc, ListBase
 	return plane_track;
 }
 
-static void delect_all_tracks(ListBase *tracks_base)
+void ed_tracking_delect_all_tracks(ListBase *tracks_base)
 {
 	MovieTrackingTrack *track;
 	for (track = tracks_base->first;
-	     track;
+	     track != NULL;
 	     track = track->next)
 	{
 		BKE_tracking_track_flag_clear(track, TRACK_AREA_ALL, SELECT);
 	}
 }
 
-static void delect_all_plane_tracks(ListBase *plane_tracks_base)
+void ed_tracking_delect_all_plane_tracks(ListBase *plane_tracks_base)
 {
 	MovieTrackingPlaneTrack *plane_track;
 	for (plane_track = plane_tracks_base->first;
-	     plane_track;
+	     plane_track != NULL;
 	     plane_track = plane_track->next)
 	{
 		plane_track->flag &= ~SELECT;
@@ -292,7 +292,7 @@ static int mouse_select(bContext *C, float co[2], int extend)
 	}
 
 	if (!extend) {
-		delect_all_plane_tracks(plane_tracks_base);
+		ed_tracking_delect_all_plane_tracks(plane_tracks_base);
 	}
 
 	if (track) {
@@ -321,7 +321,7 @@ static int mouse_select(bContext *C, float co[2], int extend)
 	}
 	else if (plane_track) {
 		if (!extend) {
-			delect_all_tracks(tracksbase);
+			ed_tracking_delect_all_tracks(tracksbase);
 		}
 
 		if (PLANE_TRACK_VIEW_SELECTED(plane_track)) {