[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49276] trunk/blender/source/blender/ blenkernel/intern/mask.c: copying a mask now copies its animation data too
Campbell Barton
ideasman42 at gmail.com
Fri Jul 27 10:36:48 CEST 2012
Revision: 49276
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49276
Author: campbellbarton
Date: 2012-07-27 08:36:48 +0000 (Fri, 27 Jul 2012)
Log Message:
-----------
copying a mask now copies its animation data too
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/mask.c
Modified: trunk/blender/source/blender/blenkernel/intern/mask.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/mask.c 2012-07-27 08:18:11 UTC (rev 49275)
+++ trunk/blender/source/blender/blenkernel/intern/mask.c 2012-07-27 08:36:48 UTC (rev 49276)
@@ -188,28 +188,48 @@
BLI_uniquename(&mask->masklayers, masklay, "MaskLayer", '.', offsetof(MaskLayer, name), sizeof(masklay->name));
}
-MaskLayer *BKE_mask_layer_copy(MaskLayer *layer)
+MaskLayer *BKE_mask_layer_copy(MaskLayer *masklay)
{
- MaskLayer *layer_new;
+ MaskLayer *masklay_new;
MaskSpline *spline;
- layer_new = MEM_callocN(sizeof(MaskLayer), "new mask layer");
+ masklay_new = MEM_callocN(sizeof(MaskLayer), "new mask layer");
- BLI_strncpy(layer_new->name, layer->name, sizeof(layer_new->name));
+ BLI_strncpy(masklay_new->name, masklay->name, sizeof(masklay_new->name));
- layer_new->alpha = layer->alpha;
- layer_new->blend = layer->blend;
- layer_new->blend_flag = layer->blend_flag;
- layer_new->flag = layer->flag;
- layer_new->restrictflag = layer->restrictflag;
+ masklay_new->alpha = masklay->alpha;
+ masklay_new->blend = masklay->blend;
+ masklay_new->blend_flag = masklay->blend_flag;
+ masklay_new->flag = masklay->flag;
+ masklay_new->restrictflag = masklay->restrictflag;
- for (spline = layer->splines.first; spline; spline = spline->next) {
+ for (spline = masklay->splines.first; spline; spline = spline->next) {
MaskSpline *spline_new = BKE_mask_spline_copy(spline);
- BLI_addtail(&layer_new->splines, spline_new);
+ BLI_addtail(&masklay_new->splines, spline_new);
}
- return layer_new;
+ /* correct animation */
+ if (masklay->splines_shapes.first) {
+ MaskLayerShape *masklay_shape;
+ MaskLayerShape *masklay_shape_new;
+
+ for (masklay_shape = masklay->splines_shapes.first;
+ masklay_shape;
+ masklay_shape = masklay_shape->next)
+ {
+ masklay_shape_new = MEM_callocN(sizeof(MaskLayerShape), "new mask layer shape");
+
+ masklay_shape_new->data = MEM_dupallocN(masklay_shape->data);
+ masklay_shape_new->tot_vert = masklay_shape->tot_vert;
+ masklay_shape_new->flag = masklay_shape->flag;
+ masklay_shape_new->frame = masklay_shape->frame;
+
+ BLI_addtail(&masklay_new->splines_shapes, masklay_shape_new);
+ }
+ }
+
+ return masklay_new;
}
void BKE_mask_layer_copy_list(ListBase *masklayers_new, ListBase *masklayers)
More information about the Bf-blender-cvs
mailing list