diff options
| author | Joshua Leung <aligorith@gmail.com> | 2013-11-20 16:01:52 +0400 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2013-11-20 16:33:02 +0400 |
| commit | 905085228f475b4ca82ba21a6414b5e0a02f49a8 (patch) | |
| tree | 11a796d0471d46a25a18994e456c14ce966f9652 /source/blender/editors | |
| parent | 96a4ee725e7685b4b3846d3d23ad8fb7429a9be9 (diff) | |
Anim Editors: Ensure that "solo" flag doesn't get accidentally handled on channels which don't support it
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/animation/anim_channels_defines.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/source/blender/editors/animation/anim_channels_defines.c b/source/blender/editors/animation/anim_channels_defines.c index d02626f9274..7b656da3de3 100644 --- a/source/blender/editors/animation/anim_channels_defines.c +++ b/source/blender/editors/animation/anim_channels_defines.c @@ -816,6 +816,11 @@ static short acf_group_setting_valid(bAnimContext *ac, bAnimListElem *UNUSED(ale { /* for now, all settings are supported, though some are only conditionally */ switch (setting) { + /* unsupported */ + case ACHANNEL_SETTING_SOLO: /* Only available in NLA Editor for tracks */ + return 0; + + /* conditionally supported */ case ACHANNEL_SETTING_VISIBLE: /* Only available in Graph Editor */ return (ac->spacetype == SPACE_IPO); @@ -925,6 +930,7 @@ static short acf_fcurve_setting_valid(bAnimContext *ac, bAnimListElem *ale, int switch (setting) { /* unsupported */ + case ACHANNEL_SETTING_SOLO: /* Solo Flag is only for NLA */ case ACHANNEL_SETTING_EXPAND: /* F-Curves are not containers */ return 0; @@ -2542,6 +2548,7 @@ static short acf_gpl_setting_valid(bAnimContext *UNUSED(ac), bAnimListElem *UNUS /* unsupported */ case ACHANNEL_SETTING_EXPAND: /* gpencil layers are more like F-Curves than groups */ case ACHANNEL_SETTING_VISIBLE: /* graph editor only */ + case ACHANNEL_SETTING_SOLO: /* nla editor only */ return 0; /* always available */ @@ -2707,6 +2714,7 @@ static short acf_masklay_setting_valid(bAnimContext *UNUSED(ac), bAnimListElem * /* unsupported */ case ACHANNEL_SETTING_EXPAND: /* mask layers are more like F-Curves than groups */ case ACHANNEL_SETTING_VISIBLE: /* graph editor only */ + case ACHANNEL_SETTING_SOLO: /* nla editor only */ return 0; /* always available */ |