[Bf-blender-cvs] [9050852] master: Anim Editors: Ensure that "solo" flag doesn't get accidentally handled on channels which don't support it

[Joshua Leung]

Commit: 905085228f475b4ca82ba21a6414b5e0a02f49a8
Author: Joshua Leung
Date:   Thu Nov 21 01:01:52 2013 +1300
http://developer.blender.org/rB905085228f475b4ca82ba21a6414b5e0a02f49a8

Anim Editors: Ensure that "solo" flag doesn't get accidentally handled on channels which don't support it

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

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 d02626f..7b656da 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 */