[Bf-blender-cvs] [798dcb4] soc-2016-multiview: fix track correspondence loading issue

[Tianwei Shen]

Commit: 798dcb489dc8432a40377f3b85c58fdc1364fdd2
Author: Tianwei Shen
Date:   Tue Jul 19 19:19:49 2016 +0800
Branches: soc-2016-multiview
https://developer.blender.org/rB798dcb489dc8432a40377f3b85c58fdc1364fdd2

fix track correspondence loading issue

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

M	source/blender/blenkernel/intern/tracking_correspondence.c
M	source/blender/blenloader/intern/readfile.c

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

diff --git a/source/blender/blenkernel/intern/tracking_correspondence.c b/source/blender/blenkernel/intern/tracking_correspondence.c
index 1e2a267..d93cf79 100644
--- a/source/blender/blenkernel/intern/tracking_correspondence.c
+++ b/source/blender/blenkernel/intern/tracking_correspondence.c
@@ -268,9 +268,11 @@ static int libmv_CorrespondencesFromTracking(ListBase *tracking_correspondences,
 			int tracknr = 0;
 			// check primary clip
 			if (self_clip == clips[i]) {
+				printf("check primary clip\n");
 				clip1 = i;
 				while (track) {
 					if (corr->self_track == track) {
+						printf("check primary track\n");
 						track1 = tracknr;
 						break;
 					}
@@ -280,9 +282,11 @@ static int libmv_CorrespondencesFromTracking(ListBase *tracking_correspondences,
 			}
 			// check witness clip
 			if (other_clip == clips[i]) {
+				printf("check witness clip\n");
 				clip2 = i;
 				while (track) {
 					if (corr->other_track == track) {
+						printf("check witness track\n");
 						track2 = tracknr;
 						break;
 					}
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index ecf9e77..26d6144 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -7402,6 +7402,7 @@ static void direct_link_movieCorrespondences(FileData *fd,
 	link_list(fd, correspondences);
 	for (corr = correspondences->first; corr != NULL; corr = corr->next) {
 		corr->self_track = newdataadr(fd, corr->self_track);
+		corr->other_track = newdataadr(fd, corr->other_track);
 	}
 }