[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59940] trunk/blender/source/blender/ blenkernel/intern/tracking.c: Fix own mistake in one of previous commits
Sergey Sharybin
sergey.vfx at gmail.com
Mon Sep 9 10:50:13 CEST 2013
Revision: 59940
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59940
Author: nazgul
Date: 2013-09-09 08:50:12 +0000 (Mon, 09 Sep 2013)
Log Message:
-----------
Fix own mistake in one of previous commits
Was overriding list's link next/prev after it was
added to the list.
Also, no need to set next/prev to NULL when adding
a link to the list.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/tracking.c
Modified: trunk/blender/source/blender/blenkernel/intern/tracking.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/tracking.c 2013-09-09 06:31:30 UTC (rev 59939)
+++ trunk/blender/source/blender/blenkernel/intern/tracking.c 2013-09-09 08:50:12 UTC (rev 59940)
@@ -2371,12 +2371,11 @@
{
MovieTrackingTrack *track;
ListBase tracks = {NULL, NULL}, new_tracks = {NULL, NULL};
- ListBase *old_tracks, *plane_tracks;
+ ListBase *old_tracks;
int a;
if (map->is_camera) {
old_tracks = &tracking->tracks;
- plane_tracks = &tracking->plane_tracks;
}
else {
MovieTrackingObject *object = BKE_tracking_object_get_named(tracking, map->object_name);
@@ -2387,7 +2386,6 @@
}
old_tracks = &object->tracks;
- plane_tracks = &object->plane_tracks;
}
/* duplicate currently operating tracks to temporary list.
@@ -2405,7 +2403,6 @@
if (old_track) {
if (BLI_findindex(old_tracks, old_track) != -1) {
BLI_remlink(old_tracks, old_track);
- BLI_addtail(&tracks, old_track);
/* Copy flags like selection back to the track map. */
track->flag = old_track->flag;
@@ -2417,6 +2414,8 @@
*old_track = *track;
old_track->markers = MEM_dupallocN(old_track->markers);
+ BLI_addtail(&tracks, old_track);
+
mapped_to_old = true;
}
}
@@ -2436,10 +2435,7 @@
track = old_tracks->first;
while (track) {
MovieTrackingTrack *next = track->next;
-
- track->next = track->prev = NULL;
BLI_addtail(&new_tracks, track);
-
track = next;
}
More information about the Bf-blender-cvs
mailing list