2.5:

* Fixed a few warnings (unused vars, missing forward struct)

diff --git a/source/blender/editors/include/ED_anim_api.h b/source/blender/editors/include/ED_anim_api.h
index 879589236ce8dedc894cbe0bd647d2205262de12..179f362b13f6c9f4379921c4e2255ce10f69f084 100644 (file)
--- a/source/blender/editors/include/ED_anim_api.h
+++ b/source/blender/editors/include/ED_anim_api.h
@@ -46,6 +46,8 @@ struct bActionGroup;
 struct FCurve;
 struct FModifier;
 
+struct uiBlock;
+
 /* ************************************************ */
 /* ANIMATION CHANNEL FILTERING */
 /* anim_filter.c */

diff --git a/source/blender/editors/space_nla/nla_draw.c b/source/blender/editors/space_nla/nla_draw.c
index 931775f1a6e53970b667123cbcbbf3c6336d4e7b..3a0e150050b8d7dec20c06862f76e8b0e566c746 100644 (file)
--- a/source/blender/editors/space_nla/nla_draw.c
+++ b/source/blender/editors/space_nla/nla_draw.c
@@ -845,7 +845,7 @@ void draw_nla_channel_list (bContext *C, bAnimContext *ac, SpaceNla *snla, ARegi
        int filter;
        
        View2D *v2d= &ar->v2d;
-       float x= 0.0f, y= 0.0f;
+       float y= 0.0f;
        int items, height;
        
        /* build list of channels to draw */
@@ -879,7 +879,6 @@ void draw_nla_channel_list (bContext *C, bAnimContext *ac, SpaceNla *snla, ARegi
                for (ale= anim_data.first; ale; ale= ale->next) {
                        const float yminc= (float)(y - NLACHANNEL_HEIGHT_HALF);
                        const float ymaxc= (float)(y + NLACHANNEL_HEIGHT_HALF);
-                       const float ydatac= (float)(y - 7);
                        
                        /* check if visible */
                        if ( IN_RANGE(yminc, v2d->cur.ymin, v2d->cur.ymax) ||