diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-09-06 04:38:28 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-09-06 04:38:28 +0400 |
| commit | 9559c95aaa45a8ca5b5653189d23837458ada9cf (patch) | |
| tree | b4768f95d412b1fbf73e466c714e711b92c1b06b /source/blender/editors/animation | |
| parent | d75a66674d17e2f4b1250b63ddb42b431135265c (diff) | |
support ANIMFILTER_FOREDIT for mask layers, also move deprecated metaball types to the end of the switch statement when evaluating metaballs.
Diffstat (limited to 'source/blender/editors/animation')
| -rw-r--r-- | source/blender/editors/animation/anim_filter.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/animation/anim_filter.c b/source/blender/editors/animation/anim_filter.c index c92b7ce2761..209414550e3 100644 --- a/source/blender/editors/animation/anim_filter.c +++ b/source/blender/editors/animation/anim_filter.c @@ -1394,13 +1394,13 @@ static size_t animdata_filter_mask_data(ListBase *anim_data, Mask *mask, const i /* only if selected */ if (ANIMCHANNEL_SELOK(SEL_MASKLAY(masklay)) ) { /* only if editable */ -// if (!(filter_mode & ANIMFILTER_FOREDIT) || EDITABLE_GPL(gpl)) { + if (!(filter_mode & ANIMFILTER_FOREDIT) || EDITABLE_MASK(masklay)) { /* active... */ if (!(filter_mode & ANIMFILTER_ACTIVE) || (masklay_act == masklay)) { /* add to list */ ANIMCHANNEL_NEW_CHANNEL(masklay, ANIMTYPE_MASKLAYER, mask); } -// } + } } } |