[Bf-blender-cvs] [35a9a7d] master: NLA Editor: Show correct tooltip for "NLA Mute" on datablock expanders

[Joshua Leung]

Commit: 35a9a7d396cd416b036e24d76171dfaf5758737e
Author: Joshua Leung
Date:   Fri May 2 19:37:24 2014 +1200
https://developer.blender.org/rB35a9a7d396cd416b036e24d76171dfaf5758737e

NLA Editor: Show correct tooltip for "NLA Mute" on datablock expanders

===================================================================

M	source/blender/editors/animation/anim_channels_defines.c

===================================================================

diff --git a/source/blender/editors/animation/anim_channels_defines.c b/source/blender/editors/animation/anim_channels_defines.c
index 3b0e061..8b4b78f 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: