diff options
author | Joshua Leung <aligorith@gmail.com> | 2011-06-21 08:01:51 +0400 |
---|---|---|
committer | Joshua Leung <aligorith@gmail.com> | 2011-06-21 08:01:51 +0400 |
commit | 24ca3eb4c42f3dfb4e2b775f53b35e4c4dcd8367 (patch) | |
tree | bb566767311f1f3b07a91333023cea24d5b657eb /source/blender/editors/space_action/action_draw.c | |
parent | a4178b7a6a1ce804f581c0e3289aa0f912085c78 (diff) |
AnimFiltering Code Cleanups - Part 2
* Changed all int's to size_t's, where the int's were used for size of
channel list returned
* Object vs Base is now passed to filtering functions - was relic from
old owner/ownertype code which required access to bases
* Found bug in NLA code where filter was being overwritten and then
used again as input for some other function unintentionally
* Found bug where trying to select a NLA strip would crash if lamp
data was around
Diffstat (limited to 'source/blender/editors/space_action/action_draw.c')
-rw-r--r-- | source/blender/editors/space_action/action_draw.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/editors/space_action/action_draw.c b/source/blender/editors/space_action/action_draw.c index 1b8a1778707..760db5dd133 100644 --- a/source/blender/editors/space_action/action_draw.c +++ b/source/blender/editors/space_action/action_draw.c @@ -77,7 +77,8 @@ void draw_channel_names(bContext *C, bAnimContext *ac, ARegion *ar) View2D *v2d= &ar->v2d; float y= 0.0f; - int items, height; + size_t items; + int height; /* build list of channels to draw */ filter= (ANIMFILTER_VISIBLE|ANIMFILTER_CHANNELS); @@ -166,7 +167,8 @@ void draw_channel_strips(bAnimContext *ac, SpaceAction *saction, ARegion *ar) AnimData *adt= NULL; float act_start, act_end, y; - int height, items; + size_t items; + int height; unsigned char col1[3], col2[3]; unsigned char col1a[3], col2a[3]; |