diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-05-19 12:40:56 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-05-19 12:40:56 +0400 |
commit | a5152b7ca0d6d7f340b1955c0e8a15ba23fda336 (patch) | |
tree | 1b8289047b989964a442deb8f084a04d07f97b00 /source/blender/editors/animation/anim_filter.c | |
parent | 8925ed1420ea2557abc7867cf12f89730ef77718 (diff) | |
parent | 65228807725d57aa4d33bcb8c3e3966d1acf0b8a (diff) |
Merged changes in the trunk up to revision 46787.
Conflicts resolved:
source/blender/blenkernel/intern/idcode.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/include/ED_anim_api.h
source/blender/editors/include/UI_resources.h
source/blender/makesrna/intern/rna_main.c
Diffstat (limited to 'source/blender/editors/animation/anim_filter.c')
-rw-r--r-- | source/blender/editors/animation/anim_filter.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/animation/anim_filter.c b/source/blender/editors/animation/anim_filter.c index 3ee3d9c6198..cebc0e8810e 100644 --- a/source/blender/editors/animation/anim_filter.c +++ b/source/blender/editors/animation/anim_filter.c @@ -380,7 +380,7 @@ short ANIM_animdata_get_context(const bContext *C, bAnimContext *ac) /* ... standard sub-channel filtering can go on here now ... */ #define END_ANIMFILTER_SUBCHANNELS \ filter_mode = _filter; \ - } + } (void)0 /* ............................... */ @@ -448,7 +448,7 @@ short ANIM_animdata_get_context(const bContext *C, bAnimContext *ac) } \ } \ } \ - } + } (void)0 /* ............................... */ @@ -468,7 +468,7 @@ short ANIM_animdata_get_context(const bContext *C, bAnimContext *ac) items ++; \ ale_statement \ } \ - } + } (void)0 #define ANIMCHANNEL_NEW_CHANNEL(channel_data, channel_type, owner_id) \ ANIMCHANNEL_NEW_CHANNEL_FULL(channel_data, channel_type, owner_id, {}) @@ -2290,7 +2290,7 @@ static size_t animdata_filter_remove_duplis(ListBase *anim_data) /* build new hashtable to efficiently store and retrieve which entries have been * encountered already while searching */ - gh = BLI_ghash_new(BLI_ghashutil_ptrhash, BLI_ghashutil_ptrcmp, "animdata_filter_duplis_remove gh"); + gh = BLI_ghash_ptr_new("animdata_filter_duplis_remove gh"); /* loop through items, removing them from the list if a similar item occurs already */ for (ale = anim_data->first; ale; ale = next) { |