diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-03-06 15:13:32 +0300 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-03-06 15:13:32 +0300 |
| commit | 33efa9eeb63db672d9da97b68718aefb14b98f64 (patch) | |
| tree | aa3e0604a33ff8a498184615e52a607bba7241a6 /source/blender/editors/animation/anim_channels_defines.c | |
| parent | 29fafab10702d83954999342b9823eedc68fdea1 (diff) | |
| parent | a2b128aa359627cc1b6d464148cb3fbc30fd32b0 (diff) | |
Merged changes in the trunk up to revision 35367.
To branch builders: From this revision Python 3.2 will be used.
Don't forget svn update in the "lib" directory as well.
Diffstat (limited to 'source/blender/editors/animation/anim_channels_defines.c')
| -rw-r--r-- | source/blender/editors/animation/anim_channels_defines.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/source/blender/editors/animation/anim_channels_defines.c b/source/blender/editors/animation/anim_channels_defines.c index dbabd47157a..cb535fd7320 100644 --- a/source/blender/editors/animation/anim_channels_defines.c +++ b/source/blender/editors/animation/anim_channels_defines.c @@ -25,6 +25,11 @@ * ***** END GPL LICENSE BLOCK ***** */ +/** \file blender/editors/animation/anim_channels_defines.c + * \ingroup edanimation + */ + + #include <stdio.h> #include "MEM_guardedalloc.h" @@ -3442,7 +3447,7 @@ void ANIM_channel_draw_widgets (bAnimContext *ac, bAnimListElem *ale, uiBlock *b uiBut *but; /* create the slider button, and assign relevant callback to ensure keyframes are inserted... */ - but= uiDefAutoButR(block, &ptr, prop, array_index, "", ICON_NULL, (int)v2d->cur.xmax-offset, ymid, SLIDER_WIDTH, (int)ymaxc-yminc); + but= uiDefAutoButR(block, &ptr, prop, array_index, "", ICON_NONE, (int)v2d->cur.xmax-offset, ymid, SLIDER_WIDTH, (int)ymaxc-yminc); /* assign keyframing function according to slider type */ if (ale->type == ANIMTYPE_SHAPEKEY) |