Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2012-06-08 11:54:46 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2012-06-08 11:54:46 +0400
commitfc07b1fce3a6f1d6962840859c763bd192fbdcd7 (patch)
tree852e55e25e36e1d46584ebd8b57531193eb24bfa /source/blender/editors/mask
parentb0c868c3b38663817678ae198ad84e7369d7957c (diff)
Mask editing: remove use_parent property and use check if paren't id is set instead
Diffstat (limited to 'source/blender/editors/mask')
-rw-r--r--source/blender/editors/mask/mask_draw.c2
-rw-r--r--source/blender/editors/mask/mask_relationships.c4
2 files changed, 2 insertions, 4 deletions
diff --git a/source/blender/editors/mask/mask_draw.c b/source/blender/editors/mask/mask_draw.c
index a26ae5ea3c0..e1efb6d841b 100644
--- a/source/blender/editors/mask/mask_draw.c
+++ b/source/blender/editors/mask/mask_draw.c
@@ -100,7 +100,7 @@ static void draw_spline_parents(MaskLayer *UNUSED(masklay), MaskSpline *spline)
MaskSplinePoint *point = &points_array[i];
BezTriple *bezt = &point->bezt;
- if (point->parent.flag & MASK_PARENT_ACTIVE) {
+ if (point->parent.id) {
glVertex2f(bezt->vec[1][0],
bezt->vec[1][1]);
diff --git a/source/blender/editors/mask/mask_relationships.c b/source/blender/editors/mask/mask_relationships.c
index 0e893ee2f9f..7c0a598ba9f 100644
--- a/source/blender/editors/mask/mask_relationships.c
+++ b/source/blender/editors/mask/mask_relationships.c
@@ -66,7 +66,7 @@ static int mask_parent_clear_exec(bContext *C, wmOperator *UNUSED(op))
MaskSplinePoint *point = &spline->points[i];
if (MASKPOINT_ISSEL_ANY(point)) {
- point->parent.flag &= ~MASK_PARENT_ACTIVE;
+ point->parent.id = NULL;
}
}
}
@@ -141,8 +141,6 @@ static int mask_parent_set_exec(bContext *C, wmOperator *UNUSED(op))
strcpy(point->parent.parent, tracking->name);
strcpy(point->parent.sub_parent, track->name);
- point->parent.flag |= MASK_PARENT_ACTIVE;
-
copy_v2_v2(point->parent.parent_orig, parmask_pos);
}
}