diff options
| author | Joshua Leung <aligorith@gmail.com> | 2014-05-02 11:37:24 +0400 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2014-05-03 08:50:40 +0400 |
| commit | 35a9a7d396cd416b036e24d76171dfaf5758737e (patch) | |
| tree | 52fcff29aa3e76f0ca3f2ae7a90c0618a7ed2825 /source/blender/editors/animation | |
| parent | 3faa48cb072c44b3d4e60ba720c537f22f850515 (diff) | |
NLA Editor: Show correct tooltip for "NLA Mute" on datablock expanders
Diffstat (limited to 'source/blender/editors/animation')
| -rw-r--r-- | source/blender/editors/animation/anim_channels_defines.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/source/blender/editors/animation/anim_channels_defines.c b/source/blender/editors/animation/anim_channels_defines.c index 3b0e061fd5d..8b4b78fe789 100644 --- a/source/blender/editors/animation/anim_channels_defines.c +++ b/source/blender/editors/animation/anim_channels_defines.c @@ -3541,10 +3541,15 @@ static void draw_setting_widget(bAnimContext *ac, bAnimListElem *ale, bAnimChann //icon = ((enabled) ? ICON_MUTE_IPO_ON : ICON_MUTE_IPO_OFF); icon = ICON_MUTE_IPO_OFF; - if (ale->type == ANIMTYPE_FCURVE) + if (ale->type == ANIMTYPE_FCURVE) { tooltip = TIP_("Does F-Curve contribute to result"); - else - tooltip = TIP_("Do channels contribute to result"); + } + else if ((ac) && (ac->spacetype == SPACE_NLA) && (ale->type != ANIMTYPE_NLATRACK)) { + tooltip = TIP_("Temporarily disable NLA stack evaluation (i.e. only the active action is evaluated)"); + } + else { + tooltip = TIP_("Do channels contribute to result (toggle channel muting)"); + } break; default: |