[Bf-blender-cvs] [0624a2d0f2a] soc-2016-multiview: Merge branch 'master' into soc-2016-multiview

Tianwei Shen noreply at git.blender.org
Thu Mar 30 08:21:04 CEST 2017


Commit: 0624a2d0f2a3ec1ddbaebce9b50a9c885251be0a
Author: Tianwei Shen
Date:   Wed Mar 22 00:05:08 2017 +0800
Branches: soc-2016-multiview
https://developer.blender.org/rB0624a2d0f2a3ec1ddbaebce9b50a9c885251be0a

Merge branch 'master' into soc-2016-multiview

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



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

diff --cc source/blender/blenloader/intern/writefile.c
index eef38c479e8,57be237be6f..c71d9f3582c
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@@ -3399,89 -3293,82 +3307,83 @@@ static void write_movieReconstruction(W
  	}
  }
  
- static void write_movieclips(WriteData *wd, ListBase *idbase)
+ static void write_movieclip(WriteData *wd, MovieClip *clip)
  {
- 	for (MovieClip *clip = idbase->first; clip; clip = clip->id.next) {
- 		if (clip->id.us > 0 || wd->current) {
- 			MovieTracking *tracking = &clip->tracking;
- 			MovieTrackingObject *object;
+ 	if (clip->id.us > 0 || wd->current) {
+ 		MovieTracking *tracking = &clip->tracking;
+ 		MovieTrackingObject *object;
  
- 			writestruct(wd, ID_MC, MovieClip, 1, clip);
- 			write_iddata(wd, &clip->id);
+ 		writestruct(wd, ID_MC, MovieClip, 1, clip);
+ 		write_iddata(wd, &clip->id);
  
- 			if (clip->adt) {
- 				write_animdata(wd, clip->adt);
- 			}
+ 		if (clip->adt) {
+ 			write_animdata(wd, clip->adt);
+ 		}
  
- 			write_movieTracks(wd, &tracking->tracks);
- 			write_moviePlaneTracks(wd, &tracking->plane_tracks);
- 			write_movieReconstruction(wd, &tracking->reconstruction);
- 			write_movieCorrespondences(wd, &tracking->correspondences);
+ 		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;
- 			while (object) {
- 				writestruct(wd, DATA, MovieTrackingObject, 1, object);
+ 		object = tracking->objects.first;
+ 		while (object) {
+ 			writestruct(wd, DATA, MovieTrackingObject, 1, object);
  
- 				write_movieTracks(wd, &object->tracks);
- 				write_moviePlaneTracks(wd, &object->plane_tracks);
- 				write_movieReconstruction(wd, &object->reconstruction);
+ 			write_movieTracks(wd, &object->tracks);
+ 			write_moviePlaneTracks(wd, &object->plane_tracks);
+ 			write_movieReconstruction(wd, &object->reconstruction);
  
- 				object = object->next;
- 			}
+ 			object = object->next;
  		}
  	}
- 
- 	mywrite_flush(wd);
  }
  
- static void write_masks(WriteData *wd, ListBase *idbase)
+ static void write_mask(WriteData *wd, Mask *mask)
  {
- 	for (Mask *mask = idbase->first; mask; mask = mask->id.next) {
- 		if (mask->id.us > 0 || wd->current) {
- 			MaskLayer *masklay;
+ 	if (mask->id.us > 0 || wd->current) {
+ 		MaskLayer *masklay;
  
- 			writestruct(wd, ID_MSK, Mask, 1, mask);
- 			write_iddata(wd, &mask->id);
+ 		writestruct(wd, ID_MSK, Mask, 1, mask);
+ 		write_iddata(wd, &mask->id);
  
- 			if (mask->adt) {
- 				write_animdata(wd, mask->adt);
- 			}
+ 		if (mask->adt) {
+ 			write_animdata(wd, mask->adt);
+ 		}
  
- 			for (masklay = mask->masklayers.first; masklay; masklay = masklay->next) {
- 				MaskSpline *spline;
- 				MaskLayerShape *masklay_shape;
+ 		for (masklay = mask->masklayers.first; masklay; masklay = masklay->next) {
+ 			MaskSpline *spline;
+ 			MaskLayerShape *masklay_shape;
  
- 				writestruct(wd, DATA, MaskLayer, 1, masklay);
+ 			writestruct(wd, DATA, MaskLayer, 1, masklay);
  
- 				for (spline = masklay->splines.first; spline; spline = spline->next) {
- 					int i;
+ 			for (spline = masklay->splines.first; spline; spline = spline->next) {
+ 				int i;
  
- 					void *points_deform = spline->points_deform;
- 					spline->points_deform = NULL;
+ 				void *points_deform = spline->points_deform;
+ 				spline->points_deform = NULL;
  
- 					writestruct(wd, DATA, MaskSpline, 1, spline);
- 					writestruct(wd, DATA, MaskSplinePoint, spline->tot_point, spline->points);
+ 				writestruct(wd, DATA, MaskSpline, 1, spline);
+ 				writestruct(wd, DATA, MaskSplinePoint, spline->tot_point, spline->points);
  
- 					spline->points_deform = points_deform;
+ 				spline->points_deform = points_deform;
  
- 					for (i = 0; i < spline->tot_point; i++) {
- 						MaskSplinePoint *point = &spline->points[i];
+ 				for (i = 0; i < spline->tot_point; i++) {
+ 					MaskSplinePoint *point = &spline->points[i];
  
- 						if (point->tot_uw) {
- 							writestruct(wd, DATA, MaskSplinePointUW, point->tot_uw, point->uw);
- 						}
+ 					if (point->tot_uw) {
+ 						writestruct(wd, DATA, MaskSplinePointUW, point->tot_uw, point->uw);
  					}
  				}
+ 			}
  
- 				for (masklay_shape = masklay->splines_shapes.first;
- 				     masklay_shape;
- 				     masklay_shape = masklay_shape->next)
- 				{
- 					writestruct(wd, DATA, MaskLayerShape, 1, masklay_shape);
- 					writedata(wd, DATA,
- 					          masklay_shape->tot_vert * sizeof(float) * MASK_OBJECT_SHAPE_ELEM_SIZE,
- 					          masklay_shape->data);
- 				}
+ 			for (masklay_shape = masklay->splines_shapes.first;
+ 				 masklay_shape;
+ 				 masklay_shape = masklay_shape->next)
+ 			{
+ 				writestruct(wd, DATA, MaskLayerShape, 1, masklay_shape);
+ 				writedata(wd, DATA,
+ 						  masklay_shape->tot_vert * sizeof(float) * MASK_OBJECT_SHAPE_ELEM_SIZE,
+ 						  masklay_shape->data);
  			}
  		}
  	}




More information about the Bf-blender-cvs mailing list