Camera tracking: minor code cleanup of RNA file, no functional changes

diff --git a/source/blender/makesrna/intern/rna_tracking.c b/source/blender/makesrna/intern/rna_tracking.c
index bcc817d0aa140b2c5e75a18cc957013cf12be123..16748d4c8ac0c2a9a6d455759434358770d1f227 100644 (file)
--- a/source/blender/makesrna/intern/rna_tracking.c
+++ b/source/blender/makesrna/intern/rna_tracking.c
@@ -88,14 +88,14 @@ static void rna_tracking_defaultSettings_searchUpdate(Main *UNUSED(bmain), Scene
                settings->default_pattern_size= settings->default_search_size;
 }
 
                settings->default_pattern_size= settings->default_search_size;
 }
 

-static void rna_tracking_tracks_begin(CollectionPropertyIterator *iter, PointerRNA *ptr)
+static void rna_trackingTracks_begin(CollectionPropertyIterator *iter, PointerRNA *ptr)

 {
        MovieClip *clip= (MovieClip*)ptr->id.data;
 
        rna_iterator_listbase_begin(iter, &clip->tracking.tracks, NULL);
 }
 
 {
        MovieClip *clip= (MovieClip*)ptr->id.data;
 
        rna_iterator_listbase_begin(iter, &clip->tracking.tracks, NULL);
 }
 

-static void rna_tracking_objects_begin(CollectionPropertyIterator *iter, PointerRNA *ptr)
+static void rna_trackingObjects_begin(CollectionPropertyIterator *iter, PointerRNA *ptr)

 {
        MovieClip *clip= (MovieClip*)ptr->id.data;
 
 {
        MovieClip *clip= (MovieClip*)ptr->id.data;
 


@@ -352,6 +352,31 @@ static void rna_trackingObject_flushUpdate(Main *UNUSED(bmain), Scene *scene, Po
        DAG_id_tag_update(&clip->id, 0);
 }
 
        DAG_id_tag_update(&clip->id, 0);
 }
 

+static void rna_trackingMarker_frame_set(PointerRNA *ptr, int value)
+{
+       MovieClip *clip = (MovieClip *) ptr->id.data;
+       MovieTracking *tracking = &clip->tracking;
+       MovieTrackingTrack *track;
+       MovieTrackingMarker *marker = (MovieTrackingMarker *) ptr->data;
+
+       track = tracking->tracks.first;
+       while (track) {
+               if (marker >= track->markers && marker < track->markers+track->markersnr) {
+                       break;
+               }
+
+               track = track->next;
+       }
+
+       if (track) {
+               MovieTrackingMarker new_marker = *marker;
+               new_marker.framenr = value;
+
+               BKE_tracking_delete_marker(track, marker->framenr);
+               BKE_tracking_insert_marker(track, &new_marker);
+       }
+}
+

 /* API */
 
 static void add_tracks_to_base(MovieClip *clip, MovieTracking *tracking, ListBase *tracksbase, int frame, int number)
 /* API */
 
 static void add_tracks_to_base(MovieClip *clip, MovieTracking *tracking, ListBase *tracksbase, int frame, int number)


@@ -367,7 +392,7 @@ static void add_tracks_to_base(MovieClip *clip, MovieTracking *tracking, ListBas
                BKE_tracking_add_track(tracking, tracksbase, 0, 0, frame, width, height);
 }
 
                BKE_tracking_add_track(tracking, tracksbase, 0, 0, frame, width, height);
 }
 

-static void rna_tracking_tracks_add(ID *id, MovieTracking *tracking, int frame, int number)
+static void rna_trackingTracks_add(ID *id, MovieTracking *tracking, int frame, int number)

 {
        MovieClip *clip= (MovieClip *) id;
 
 {
        MovieClip *clip= (MovieClip *) id;
 


@@ -389,7 +414,7 @@ static void rna_trackingObject_tracks_add(ID *id, MovieTrackingObject *object, i
        WM_main_add_notifier(NC_MOVIECLIP|NA_EDITED, NULL);
 }
 
        WM_main_add_notifier(NC_MOVIECLIP|NA_EDITED, NULL);
 }
 

-static MovieTrackingObject *rna_tracking_object_new(MovieTracking *tracking, const char *name)
+static MovieTrackingObject *rna_trackingObject_new(MovieTracking *tracking, const char *name)

 {
        MovieTrackingObject *object= BKE_tracking_new_object(tracking, name);
 
 {
        MovieTrackingObject *object= BKE_tracking_new_object(tracking, name);
 


@@ -398,38 +423,13 @@ static MovieTrackingObject *rna_tracking_object_new(MovieTracking *tracking, con
        return object;
 }
 
        return object;
 }
 

-void rna_tracking_object_remove(MovieTracking *tracking, MovieTrackingObject *object)
+void rna_trackingObject_remove(MovieTracking *tracking, MovieTrackingObject *object)

 {
        BKE_tracking_remove_object(tracking, object);
 
        WM_main_add_notifier(NC_MOVIECLIP|NA_EDITED, NULL);
 }
 
 {
        BKE_tracking_remove_object(tracking, object);
 
        WM_main_add_notifier(NC_MOVIECLIP|NA_EDITED, NULL);
 }
 

-static void rna_trackingMarker_frame_set(PointerRNA *ptr, int value)
-{
-       MovieClip *clip = (MovieClip *) ptr->id.data;
-       MovieTracking *tracking = &clip->tracking;
-       MovieTrackingTrack *track;
-       MovieTrackingMarker *marker = (MovieTrackingMarker *) ptr->data;
-
-       track = tracking->tracks.first;
-       while (track) {
-               if (marker >= track->markers && marker < track->markers+track->markersnr) {
-                       break;
-               }
-
-               track = track->next;
-       }
-
-       if (track) {
-               MovieTrackingMarker new_marker = *marker;
-               new_marker.framenr = value;
-
-               BKE_tracking_delete_marker(track, marker->framenr);
-               BKE_tracking_insert_marker(track, &new_marker);
-       }
-}
-

 static MovieTrackingMarker *rna_trackingMarkers_find_frame(MovieTrackingTrack *track, int framenr)
 {
        return BKE_tracking_exact_marker(track, framenr);
 static MovieTrackingMarker *rna_trackingMarkers_find_frame(MovieTrackingTrack *track, int framenr)
 {
        return BKE_tracking_exact_marker(track, framenr);


@@ -1129,7 +1129,7 @@ static void rna_def_trackingTracks(BlenderRNA *brna)
        RNA_def_struct_sdna(srna, "MovieTracking");
        RNA_def_struct_ui_text(srna, "Movie Tracks", "Collection of movie tracking tracks");
 
        RNA_def_struct_sdna(srna, "MovieTracking");
        RNA_def_struct_ui_text(srna, "Movie Tracks", "Collection of movie tracking tracks");
 

-       func= RNA_def_function(srna, "add", "rna_tracking_tracks_add");
+       func= RNA_def_function(srna, "add", "rna_trackingTracks_add");

        RNA_def_function_flag(func, FUNC_USE_SELF_ID);
        RNA_def_function_ui_description(func, "Add a number of tracks to this movie clip");
        RNA_def_int(func, "frame", 1, MINFRAME, MAXFRAME, "Frame", "Frame number to add tracks on", MINFRAME, MAXFRAME);
        RNA_def_function_flag(func, FUNC_USE_SELF_ID);
        RNA_def_function_ui_description(func, "Add a number of tracks to this movie clip");
        RNA_def_int(func, "frame", 1, MINFRAME, MAXFRAME, "Frame", "Frame number to add tracks on", MINFRAME, MAXFRAME);


@@ -1224,13 +1224,13 @@ static void rna_def_trackingObjects(BlenderRNA *brna, PropertyRNA *cprop)
        RNA_def_struct_sdna(srna, "MovieTracking");
        RNA_def_struct_ui_text(srna, "Movie Objects", "Collection of movie trackingobjects");
 
        RNA_def_struct_sdna(srna, "MovieTracking");
        RNA_def_struct_ui_text(srna, "Movie Objects", "Collection of movie trackingobjects");
 

-       func= RNA_def_function(srna, "new", "rna_tracking_object_new");
+       func= RNA_def_function(srna, "new", "rna_trackingObject_new");

        RNA_def_function_ui_description(func, "Add tracking object to this movie clip");
        RNA_def_string(func, "name", "", 0, "", "Name of new object");
        parm= RNA_def_pointer(func, "object", "MovieTrackingObject", "", "New motion tracking object");
        RNA_def_function_return(func, parm);
 
        RNA_def_function_ui_description(func, "Add tracking object to this movie clip");
        RNA_def_string(func, "name", "", 0, "", "Name of new object");
        parm= RNA_def_pointer(func, "object", "MovieTrackingObject", "", "New motion tracking object");
        RNA_def_function_return(func, parm);
 

-       func= RNA_def_function(srna, "remove", "rna_tracking_object_remove");
+       func= RNA_def_function(srna, "remove", "rna_trackingObject_remove");

        RNA_def_function_ui_description(func, "Remove tracking object from this movie clip");
        parm= RNA_def_pointer(func, "object", "MovieTrackingObject", "", "Motion tracking object to be removed");
 
        RNA_def_function_ui_description(func, "Remove tracking object from this movie clip");
        parm= RNA_def_pointer(func, "object", "MovieTrackingObject", "", "Motion tracking object to be removed");
 


@@ -1269,7 +1269,7 @@ static void rna_def_tracking(BlenderRNA *brna)
 
        /* tracks */
        prop= RNA_def_property(srna, "tracks", PROP_COLLECTION, PROP_NONE);
 
        /* tracks */
        prop= RNA_def_property(srna, "tracks", PROP_COLLECTION, PROP_NONE);

-       RNA_def_property_collection_funcs(prop, "rna_tracking_tracks_begin", "rna_iterator_listbase_next", "rna_iterator_listbase_end", "rna_iterator_listbase_get", 0, 0, 0, 0);
+       RNA_def_property_collection_funcs(prop, "rna_trackingTracks_begin", "rna_iterator_listbase_next", "rna_iterator_listbase_end", "rna_iterator_listbase_get", 0, 0, 0, 0);

        RNA_def_property_struct_type(prop, "MovieTrackingTrack");
        RNA_def_property_ui_text(prop, "Tracks", "Collection of tracks in this tracking data object");
        RNA_def_property_srna(prop, "MovieTrackingTracks");
        RNA_def_property_struct_type(prop, "MovieTrackingTrack");
        RNA_def_property_ui_text(prop, "Tracks", "Collection of tracks in this tracking data object");
        RNA_def_property_srna(prop, "MovieTrackingTracks");


@@ -1284,7 +1284,7 @@ static void rna_def_tracking(BlenderRNA *brna)
 
        /* objects */
        prop= RNA_def_property(srna, "objects", PROP_COLLECTION, PROP_NONE);
 
        /* objects */
        prop= RNA_def_property(srna, "objects", PROP_COLLECTION, PROP_NONE);

-       RNA_def_property_collection_funcs(prop, "rna_tracking_objects_begin", "rna_iterator_listbase_next", "rna_iterator_listbase_end", "rna_iterator_listbase_get", 0, 0, 0, 0);
+       RNA_def_property_collection_funcs(prop, "rna_trackingObjects_begin", "rna_iterator_listbase_next", "rna_iterator_listbase_end", "rna_iterator_listbase_get", 0, 0, 0, 0);

        RNA_def_property_struct_type(prop, "MovieTrackingObject");
        RNA_def_property_ui_text(prop, "Objects", "Collection of objects in this tracking data object");
        rna_def_trackingObjects(brna, prop);
        RNA_def_property_struct_type(prop, "MovieTrackingObject");
        RNA_def_property_ui_text(prop, "Objects", "Collection of objects in this tracking data object");
        rna_def_trackingObjects(brna, prop);