diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-06-04 01:11:10 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-06-04 01:11:10 +0400 |
| commit | 329b05dcd789bd8421661898697ed060c83b3286 (patch) | |
| tree | 3d664826fefbe62078c878baab174e066eb48afa /source/blender/editors/animation/anim_channels_edit.c | |
| parent | eabf741a8d76aa9400a071c37227504378fc6315 (diff) | |
| parent | f9856c1c2da8139651eb59ff3bf174065d0f628c (diff) | |
Merged changes in the trunk up to revision 47381.
Conflicts resolved:
source/blender/blenloader/intern/readfile.c
Diffstat (limited to 'source/blender/editors/animation/anim_channels_edit.c')
| -rw-r--r-- | source/blender/editors/animation/anim_channels_edit.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/animation/anim_channels_edit.c b/source/blender/editors/animation/anim_channels_edit.c index 2bfbde86ed3..bbf89dfa74d 100644 --- a/source/blender/editors/animation/anim_channels_edit.c +++ b/source/blender/editors/animation/anim_channels_edit.c @@ -500,7 +500,7 @@ void ANIM_flush_setting_anim_channels(bAnimContext *ac, ListBase *anim_data, bAn break; /* store this level as the 'old' level now */ - // prevLevel= level; // XXX: prevLevel is unused + // prevLevel = level; // XXX: prevLevel is unused } } } @@ -2021,7 +2021,7 @@ static int animchannels_rename_invoke(bContext *C, wmOperator *UNUSED(op), wmEve v2d = &ar->v2d; /* figure out which channel user clicked in - * Note: although channels technically start at y= ACHANNEL_FIRST, we need to adjust by half a channel's height + * Note: although channels technically start at (y = ACHANNEL_FIRST), we need to adjust by half a channel's height * so that the tops of channels get caught ok. Since ACHANNEL_FIRST is really ACHANNEL_HEIGHT, we simply use * ACHANNEL_HEIGHT_HALF. */ @@ -2335,7 +2335,7 @@ static int animchannels_mouseclick_invoke(bContext *C, wmOperator *op, wmEvent * selectmode = SELECT_REPLACE; /* figure out which channel user clicked in - * Note: although channels technically start at y= ACHANNEL_FIRST, we need to adjust by half a channel's height + * Note: although channels technically start at (y = ACHANNEL_FIRST), we need to adjust by half a channel's height * so that the tops of channels get caught ok. Since ACHANNEL_FIRST is really ACHANNEL_HEIGHT, we simply use * ACHANNEL_HEIGHT_HALF. */ |