[Bf-blender-cvs] [dc67e63acb5] master: Mask: Fix missing remap of active spline/point on copy
Sergey Sharybin
noreply at git.blender.org
Tue May 21 15:45:56 CEST 2019
Commit: dc67e63acb52eacf2f1451ce5000f4500a8217d6
Author: Sergey Sharybin
Date: Tue May 21 15:45:03 2019 +0200
Branches: master
https://developer.blender.org/rBdc67e63acb52eacf2f1451ce5000f4500a8217d6
Mask: Fix missing remap of active spline/point on copy
===================================================================
M source/blender/blenkernel/intern/mask.c
===================================================================
diff --git a/source/blender/blenkernel/intern/mask.c b/source/blender/blenkernel/intern/mask.c
index 9a9b3757ef2..43fc8152c7b 100644
--- a/source/blender/blenkernel/intern/mask.c
+++ b/source/blender/blenkernel/intern/mask.c
@@ -225,6 +225,16 @@ MaskLayer *BKE_mask_layer_copy(const MaskLayer *masklay)
MaskSpline *spline_new = BKE_mask_spline_copy(spline);
BLI_addtail(&masklay_new->splines, spline_new);
+
+ if (spline == masklay->act_spline) {
+ masklay_new->act_spline = spline_new;
+ }
+
+ if (masklay->act_point >= spline->points &&
+ masklay->act_point < spline->points + spline->tot_point) {
+ const size_t point_index = masklay->act_point - spline->points;
+ masklay_new->act_point = spline_new->points + point_index;
+ }
}
/* correct animation */
More information about the Bf-blender-cvs
mailing list