harmless changes to quiet clang static check warnings.

- made EXPANDED_AGRP take bAnimContext as an argument.
- remove unneeded NULL check drawFacesColored functions.
- comment some vars which are set but not used.

3 files changed, 6 insertions, 5 deletions

diff --git a/source/blender/editors/animation/anim_channels_defines.c b/source/blender/editors/animation/anim_channels_defines.c
index 3374b3c6f95..51fde09b074 100644
--- a/source/blender/editors/animation/anim_channels_defines.c
+++ b/source/blender/editors/animation/anim_channels_defines.c
@@ -3275,6 +3275,7 @@ void ANIM_channel_draw_widgets (bAnimContext *ac, bAnimListElem *ale, uiBlock *b
 			draw_setting_widget(ac, ale, acf, block, offset, ymid, ACHANNEL_SETTING_SOLO);
 			offset += ICON_WIDTH; 
 		}
+		(void)offset;
 	}
 	
 	/* step 4) draw text... */
diff --git a/source/blender/editors/animation/anim_channels_edit.c b/source/blender/editors/animation/anim_channels_edit.c
index 0845014c99e..4edcca46935 100644
--- a/source/blender/editors/animation/anim_channels_edit.c
+++ b/source/blender/editors/animation/anim_channels_edit.c
@@ -169,9 +169,9 @@ void ANIM_set_active_channel (bAnimContext *ac, void *data, short datatype, int
 			case ANIMTYPE_DSLAT:
 			{
 				/* need to verify that this data is valid for now */
-				// XXX: ale may be null!
-				if (ale->adt)
+				if (ale && ale->adt) {
 					ale->adt->flag |= ADT_UI_ACTIVE;
+				}
 			}
 				break;
 		}
@@ -1001,7 +1001,7 @@ static void rearrange_action_channels (bAnimContext *ac, bAction *act, short mod
 		
 		for (agrp= act->groups.first; agrp; agrp= agrp->next) {
 			/* only consider F-Curves if they're visible (group expanded) */
-			if (EXPANDED_AGRP(agrp)) {
+			if (EXPANDED_AGRP(ac, agrp)) {
 				rearrange_animchannel_islands(&agrp->channels, rearrange_func, mode, ANIMTYPE_FCURVE);
 			}
 		}
diff --git a/source/blender/editors/animation/anim_filter.c b/source/blender/editors/animation/anim_filter.c
index cca4fdbe331..71893cee89a 100644
--- a/source/blender/editors/animation/anim_filter.c
+++ b/source/blender/editors/animation/anim_filter.c
@@ -1017,7 +1017,7 @@ static int animdata_filter_action (bAnimContext *ac, ListBase *anim_data, bDopeS
 		 * but the group isn't expanded...
 		 */
 		if ( (filter_mode & (ANIMFILTER_SEL|ANIMFILTER_UNSEL)) &&	/* care about selection status */
-			 (EXPANDED_AGRP(agrp)==0) )								/* group isn't expanded */
+			 (EXPANDED_AGRP(ac, agrp)==0) )								/* group isn't expanded */
 		{
 			/* if the group itself isn't selected appropriately, we shouldn't consider it's children either */
 			if (ANIMCHANNEL_SELOK(SEL_AGRP(agrp)) == 0)
@@ -1076,7 +1076,7 @@ static int animdata_filter_action (bAnimContext *ac, ListBase *anim_data, bDopeS
 				 *	- group is expanded
 				 *	- we just need the F-Curves present
 				 */
-				if ( (!(filter_mode & ANIMFILTER_VISIBLE) || EXPANDED_AGRP(agrp)) || (filter_mode & ANIMFILTER_CURVESONLY) ) 
+				if ( (!(filter_mode & ANIMFILTER_VISIBLE) || EXPANDED_AGRP(ac, agrp)) || (filter_mode & ANIMFILTER_CURVESONLY) )
 				{
 					/* for the Graph Editor, curves may be set to not be visible in the view to lessen clutter,
 					 * but to do this, we need to check that the group doesn't have it's not-visible flag set preventing