diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-06-08 18:31:38 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-06-08 18:31:38 +0400 |
commit | b33c5168f4070e30f5ef66dcca76d1ad3c4aaa38 (patch) | |
tree | 9303fd49af427824aa3867813a45ec5e46cea781 /source/blender/editors/animation/keyframes_draw.c | |
parent | 68c365e2f040cb61266d6ef1309fb22d064ab0d0 (diff) |
mask animation keys now editable in the dope sheet (duplicate, transform, delete, select- etc).
Diffstat (limited to 'source/blender/editors/animation/keyframes_draw.c')
-rw-r--r-- | source/blender/editors/animation/keyframes_draw.c | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/source/blender/editors/animation/keyframes_draw.c b/source/blender/editors/animation/keyframes_draw.c index cee8d15a807..e6fc4d5a168 100644 --- a/source/blender/editors/animation/keyframes_draw.c +++ b/source/blender/editors/animation/keyframes_draw.c @@ -209,7 +209,7 @@ static DLRBT_Node *nalloc_ak_masklayshape(void *data) /* store settings based on state of BezTriple */ ak->cfra = masklay_shape->frame; - ak->sel = (masklay_shape->flag & SELECT) ? SELECT : 0; + ak->sel = (masklay_shape->flag & MASK_SHAPE_SELECT) ? SELECT : 0; /* set 'modified', since this is used to identify long keyframes */ ak->modified = 1; @@ -224,7 +224,7 @@ static void nupdate_ak_masklayshape(void *node, void *data) MaskLayerShape *masklay_shape = (MaskLayerShape *)data; /* set selection status and 'touched' status */ - if (masklay_shape->flag & SELECT) ak->sel = SELECT; + if (masklay_shape->flag & MASK_SHAPE_SELECT) ak->sel = SELECT; ak->modified += 1; } @@ -818,6 +818,21 @@ void draw_gpl_channel(View2D *v2d, bDopeSheet *ads, bGPDlayer *gpl, float ypos) BLI_dlrbTree_free(&keys); } +void draw_masklay_channel(View2D *v2d, bDopeSheet *ads, MaskLayer *masklay, float ypos) +{ + DLRBT_Tree keys; + + BLI_dlrbTree_init(&keys); + + mask_to_keylist(ads, masklay, &keys); + + BLI_dlrbTree_linkedlist_sync(&keys); + + draw_keylist(v2d, &keys, NULL, ypos, (masklay->flag & MASK_LAYERFLAG_LOCKED)); + + BLI_dlrbTree_free(&keys); +} + /* *************************** Keyframe List Conversions *************************** */ void summary_to_keylist(bAnimContext *ac, DLRBT_Tree *keys, DLRBT_Tree *blocks) |