Commit: 30c4194876229dbd5fa85cb79a65d54bf5e33894
Author: Tianwei Shen
Date: Wed Jun 29 21:32:05 2016 +0800
Branches: soc-2016-multiview
https://developer.blender.org/rB30c4194876229dbd5fa85cb79a65d54bf5e33894
Merge branch 'master' into soc-2016-multiview
===================================================================
===================================================================
diff --cc source/blender/blenloader/intern/writefile.c
index 5331656,19fb80f..61fdad2
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@@ -3189,18 -3463,11 +3463,19 @@@ static void write_moviePlaneTracks(Writ
}
}
+static void write_movieCorrespondences(WriteData *wd, ListBase
*correspondence_base)
+{
+ MovieTrackingCorrespondence *corr;
+ for (corr = correspondence_base->first; corr != NULL; corr =
corr->next) {
+ writestruct(wd, DATA, "MovieTrackingCorrespondence", 1, corr);
+ }
+}
+
static void write_movieReconstruction(WriteData *wd,
MovieTrackingReconstruction *reconstruction)
{
- if (reconstruction->camnr)
- writestruct(wd, DATA, "MovieReconstructedCamera",
reconstruction->camnr, reconstruction->cameras);
+ if (reconstruction->camnr) {
+ writestruct(wd, DATA, MovieReconstructedCamera,
reconstruction->camnr, reconstruction->cameras);
+ }
}
static void write_movieclips(WriteData *wd, ListBase *idbase)
@@@ -3222,11 -3490,10 +3498,11 @@@
write_movieTracks(wd, &tracking->tracks);
write_moviePlaneTracks(wd, &tracking->plane_tracks);
write_movieReconstruction(wd,
&tracking->reconstruction);
+ write_movieCorrespondences(wd,
&tracking->correspondences);
- object= tracking->objects.first;
+ object = tracking->objects.first;
while (object) {
- writestruct(wd, DATA, "MovieTrackingObject", 1,
object);
+ writestruct(wd, DATA, MovieTrackingObject, 1,
object);
write_movieTracks(wd, &object->tracks);
write_moviePlaneTracks(wd,
&object->plane_tracks);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
