diff options
author | Thomas Dinges <blender@dingto.org> | 2014-08-06 02:45:13 +0400 |
---|---|---|
committer | Thomas Dinges <blender@dingto.org> | 2014-08-06 02:45:13 +0400 |
commit | c689a2ea8c016d3dffda73fc5916ad2717ffc2e1 (patch) | |
tree | b76bacbe6f109671415e1744abb9dadb929a56b1 /source/blender/editors/animation/anim_channels_edit.c | |
parent | 2c331302773bfbd725c1a9a102b7e637a46a2a2f (diff) | |
parent | 4cf531f7a05434a9bbd6144a7ec0314e60aaff40 (diff) |
Merge remote-tracking branch 'origin/master' into soc-2014-cyclessoc-2014-cycles
Diffstat (limited to 'source/blender/editors/animation/anim_channels_edit.c')
-rw-r--r-- | source/blender/editors/animation/anim_channels_edit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/animation/anim_channels_edit.c b/source/blender/editors/animation/anim_channels_edit.c index 97078043dc9..b6ab0407711 100644 --- a/source/blender/editors/animation/anim_channels_edit.c +++ b/source/blender/editors/animation/anim_channels_edit.c @@ -901,10 +901,10 @@ static void rearrange_animchannels_filter_visible(ListBase *anim_data_visible, b { ListBase anim_data = {NULL, NULL}; bAnimListElem *ale, *ale_next; - int filter = (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_LIST_CHANNELS); + int filter = (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_LIST_CHANNELS); /* get all visible channels */ - ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype); + ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype); /* now, only keep the ones that are of the types we are interested in */ for (ale = anim_data.first; ale; ale = ale_next) { |