diff options
| author | Nicholas Bishop <nicholasbishop@gmail.com> | 2010-10-18 06:43:53 +0400 |
|---|---|---|
| committer | Nicholas Bishop <nicholasbishop@gmail.com> | 2010-10-18 06:43:53 +0400 |
| commit | 08232350d5797302e3638e69ec78657d853976aa (patch) | |
| tree | ad5ff38236343cdcb5eee6d8c6711cb1b32a1912 /source/blender/editors/animation/anim_channels_edit.c | |
| parent | 5b31d545dfae5ee3fd5f4a5d0e9497a1c7c2a86b (diff) | |
| parent | a6d62bf0db09ae2759fd45abb3af563fefc13690 (diff) | |
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r32200:32300
Diffstat (limited to 'source/blender/editors/animation/anim_channels_edit.c')
| -rw-r--r-- | source/blender/editors/animation/anim_channels_edit.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/editors/animation/anim_channels_edit.c b/source/blender/editors/animation/anim_channels_edit.c index e229de42006..4414da222a6 100644 --- a/source/blender/editors/animation/anim_channels_edit.c +++ b/source/blender/editors/animation/anim_channels_edit.c @@ -155,6 +155,7 @@ void ANIM_set_active_channel (bAnimContext *ac, void *data, short datatype, int case ANIMTYPE_DSMESH: { /* need to verify that this data is valid for now */ + // XXX: ale may be null! if (ale->adt) ale->adt->flag |= ADT_UI_ACTIVE; } @@ -462,7 +463,7 @@ void ANIM_flush_setting_anim_channels (bAnimContext *ac, ListBase *anim_data, bA break; /* store this level as the 'old' level now */ - prevLevel= level; + prevLevel= level; // XXX: prevLevel is unused } } } @@ -1885,7 +1886,6 @@ static int mouse_anim_channels (bAnimContext *ac, float x, int channel_index, sh static int animchannels_mouseclick_invoke(bContext *C, wmOperator *op, wmEvent *event) { bAnimContext ac; - Scene *scene; ARegion *ar; View2D *v2d; int mval[2], channel_index; @@ -1899,7 +1899,6 @@ static int animchannels_mouseclick_invoke(bContext *C, wmOperator *op, wmEvent * return OPERATOR_CANCELLED; /* get useful pointers from animation context data */ - scene= ac.scene; ar= ac.ar; v2d= &ar->v2d; |