[Bf-blender-cvs] [1aa753c] master: Mask spline slide didn't respect auto-key
Sergey Sharybin
noreply at git.blender.org
Fri Apr 4 13:20:06 CEST 2014
Commit: 1aa753ce8847c0f3bbee4e1de44b2fe75586c135
Author: Sergey Sharybin
Date: Fri Apr 4 17:19:36 2014 +0600
https://developer.blender.org/rB1aa753ce8847c0f3bbee4e1de44b2fe75586c135
Mask spline slide didn't respect auto-key
===================================================================
M source/blender/editors/mask/mask_ops.c
===================================================================
diff --git a/source/blender/editors/mask/mask_ops.c b/source/blender/editors/mask/mask_ops.c
index 8011b29..089b015 100644
--- a/source/blender/editors/mask/mask_ops.c
+++ b/source/blender/editors/mask/mask_ops.c
@@ -1011,6 +1011,7 @@ void MASK_OT_slide_point(wmOperatorType *ot)
typedef struct SlideSplineCurvatureData {
Mask *mask;
+ MaskLayer *mask_layer;
MaskSpline *spline;
MaskSplinePoint *point;
float u;
@@ -1085,6 +1086,7 @@ static SlideSplineCurvatureData *slide_spline_curvature_customdata(
slide_data = MEM_callocN(sizeof(SlideSplineCurvatureData), "slide curvature slide");
slide_data->mask = mask;
+ slide_data->mask_layer = mask_layer;
slide_data->spline = spline;
slide_data->point = point;
slide_data->u = u;
@@ -1201,6 +1203,7 @@ static void slide_spline_solve_P2(const float u,
static int slide_spline_curvature_modal(bContext *C, wmOperator *op, const wmEvent *event)
{
+ Scene *scene = CTX_data_scene(C);
const float margin = 0.2f;
SlideSplineCurvatureData *slide_data = (SlideSplineCurvatureData *) op->customdata;
float u = slide_data->u;
@@ -1339,6 +1342,10 @@ static int slide_spline_curvature_modal(bContext *C, wmOperator *op, const wmEve
case LEFTMOUSE:
if (event->val == KM_RELEASE) {
+ /* dont key sliding feather uw's */
+ if (IS_AUTOKEY_ON(scene)) {
+ ED_mask_layer_shape_auto_key(slide_data->mask_layer, CFRA);
+ }
WM_event_add_notifier(C, NC_MASK | NA_EDITED, slide_data->mask);
DAG_id_tag_update(&slide_data->mask->id, 0);
More information about the Bf-blender-cvs
mailing list