diff options
author | Campbell Barton <ideasman42@gmail.com> | 2015-11-23 07:44:15 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2015-11-23 09:40:50 +0300 |
commit | 48b1656a6cce6fd7606a671eea9d0d17b67d7445 (patch) | |
tree | d95ed94cf1d1934c01de44364db7d53ca2262ff3 /source/blender/editors/mask/mask_ops.c | |
parent | 6e4cb463c44ab57331cda7ded645b4faa573bbb3 (diff) |
Cleanup: shadowing (editors)
Diffstat (limited to 'source/blender/editors/mask/mask_ops.c')
-rw-r--r-- | source/blender/editors/mask/mask_ops.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/source/blender/editors/mask/mask_ops.c b/source/blender/editors/mask/mask_ops.c index bf8630ff843..eef03852007 100644 --- a/source/blender/editors/mask/mask_ops.c +++ b/source/blender/editors/mask/mask_ops.c @@ -929,7 +929,6 @@ static int slide_point_modal(bContext *C, wmOperator *op, const wmEvent *event) if (data->is_sliding_new_point) { if (ELEM(data->which_handle, MASK_WHICH_HANDLE_LEFT, MASK_WHICH_HANDLE_RIGHT)) { - BezTriple *bezt = &data->point->bezt; float vec[2]; short self_handle = (data->which_handle == MASK_WHICH_HANDLE_LEFT) ? 0 : 2; short other_handle = (data->which_handle == MASK_WHICH_HANDLE_LEFT) ? 2 : 0; @@ -1005,12 +1004,12 @@ static int slide_point_modal(bContext *C, wmOperator *op, const wmEvent *event) w = len_v2(vec); if (is_overall_feather) { - float delta; + float w_delta; if (dot_v2v2(no, vec) <= 0.0f) w = -w; - delta = w - data->weight * data->weight_scalar; + w_delta = w - data->weight * data->weight_scalar; if (data->orig_spline == NULL) { /* restore weight for currently sliding point, so orig_spline would be created @@ -1025,7 +1024,7 @@ static int slide_point_modal(bContext *C, wmOperator *op, const wmEvent *event) *weight = w * weight_scalar; } - slide_point_delta_all_feather(data, delta); + slide_point_delta_all_feather(data, w_delta); } else { if (dot_v2v2(no, vec) <= 0.0f) @@ -1081,7 +1080,6 @@ static int slide_point_modal(bContext *C, wmOperator *op, const wmEvent *event) } if (data->is_sliding_new_point) { - BezTriple *bezt = &data->point->bezt; if (len_squared_v2v2(bezt->vec[0], bezt->vec[1]) < FLT_EPSILON) { bezt->h1 = HD_VECT; } |