griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

dont extrude from active-unselected mask-spline verts.

Browse Source
This commit is contained in:
Campbell Barton
2012-06-04 14:35:45 +00:00
parent 7b8ee67933
commit f8266d5a4b
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/editors/mask/mask_add.c
View File

@@ -317,7 +317,7 @@ static void finSelectedSplinePoint(MaskLayer *masklay, MaskSpline **spline, Mask
*point = NULL;
if (check_active) {
if (masklay->act_spline && masklay->act_point) {
if (masklay->act_spline && masklay->act_point && MASKPOINT_ISSEL_ANY(masklay->act_point)) {
*spline = masklay->act_spline;
*point = masklay->act_point;
return;
@@ -415,8 +415,6 @@ static int add_vertex_extrude(bContext *C, Mask *mask, MaskLayer *masklay, const
int do_recalc_src = FALSE; /* when extruding from endpoints only */
int do_prev; /* use prev point rather then next?? */
ED_mask_select_toggle_all(mask, SEL_DESELECT);
if (!masklay) {
return FALSE;
}
@@ -424,6 +422,8 @@ static int add_vertex_extrude(bContext *C, Mask *mask, MaskLayer *masklay, const
finSelectedSplinePoint(masklay, &spline, &point, TRUE);
}
ED_mask_select_toggle_all(mask, SEL_DESELECT);
point_index = (point - spline->points);
MASKPOINT_DESEL_ALL(point);
@@ -507,8 +507,6 @@ static int add_vertex_new(bContext *C, Mask *mask, MaskLayer *masklay, const flo
MaskSplinePoint *point;
MaskSplinePoint *new_point = NULL, *ref_point = NULL;
ED_mask_select_toggle_all(mask, SEL_DESELECT);
if (!masklay) {
/* if there's no masklay currently operationg on, create new one */
masklay = BKE_mask_layer_new(mask, "");
@@ -520,6 +518,8 @@ static int add_vertex_new(bContext *C, Mask *mask, MaskLayer *masklay, const flo
finSelectedSplinePoint(masklay, &spline, &point, TRUE);
}
ED_mask_select_toggle_all(mask, SEL_DESELECT);
if (!spline) {
/* no selected splines in active masklay, create new spline */
spline = BKE_mask_spline_add(masklay);