diff options
author | Joshua Leung <aligorith@gmail.com> | 2009-07-17 04:17:37 +0400 |
---|---|---|
committer | Joshua Leung <aligorith@gmail.com> | 2009-07-17 04:17:37 +0400 |
commit | c6c853d88a9c5ff12b7a56e4bdaca1757f160997 (patch) | |
tree | c0f61ece2d2f129e51d2a3b75f8d2ba79096b591 /source | |
parent | ef28383ab93d72b49d9ec0a7f6229f3ee80cfa5d (diff) |
2.5 - 2 Tweaks
* Comment re-formatting for keyframe drawing code
* Removed redundant frame number button from buttons view header.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/editors/animation/keyframes_draw.c | 20 | ||||
-rw-r--r-- | source/blender/editors/space_buttons/buttons_header.c | 4 |
2 files changed, 11 insertions, 13 deletions
diff --git a/source/blender/editors/animation/keyframes_draw.c b/source/blender/editors/animation/keyframes_draw.c index 1db78beb2cb..64e008b92ca 100644 --- a/source/blender/editors/animation/keyframes_draw.c +++ b/source/blender/editors/animation/keyframes_draw.c @@ -91,14 +91,14 @@ #include "ED_screen.h" #include "ED_space_api.h" -/* *************************** Keyframe Drawing *************************** */ +/* *************************** Keyframe Processing *************************** */ +/* The equivalent of add_to_cfra_elem except this version + * makes ActKeyColumns - one of the two datatypes required + * for DopeSheet drawing. + */ static void add_bezt_to_keycolumnslist(ListBase *keys, BezTriple *bezt) { - /* The equivalent of add_to_cfra_elem except this version - * makes ActKeyColumns - one of the two datatypes required - * for action editor drawing. - */ ActKeyColumn *ak, *akn; if (ELEM(NULL, keys, bezt)) return; @@ -133,12 +133,12 @@ static void add_bezt_to_keycolumnslist(ListBase *keys, BezTriple *bezt) akn->sel = 0; } +/* The equivalent of add_to_cfra_elem except this version + * makes ActKeyBlocks - one of the two datatypes required + * for DopeSheet drawing. + */ static void add_bezt_to_keyblockslist(ListBase *blocks, FCurve *fcu, int index) { - /* The equivalent of add_to_cfra_elem except this version - * makes ActKeyBlocks - one of the two datatypes required - * for action editor drawing. - */ ActKeyBlock *ab, *abn; BezTriple *beztn=NULL, *prev=NULL; BezTriple *bezt; @@ -210,6 +210,8 @@ static void add_bezt_to_keyblockslist(ListBase *blocks, FCurve *fcu, int index) abn->modified = 1; } +/* *************************** Keyframe Drawing *************************** */ + /* helper function - find actkeycolumn that occurs on cframe */ static ActKeyColumn *cfra_find_actkeycolumn (ListBase *keys, float cframe) { diff --git a/source/blender/editors/space_buttons/buttons_header.c b/source/blender/editors/space_buttons/buttons_header.c index 99cc85d9a52..ff906b7f539 100644 --- a/source/blender/editors/space_buttons/buttons_header.c +++ b/source/blender/editors/space_buttons/buttons_header.c @@ -192,10 +192,6 @@ void buttons_header_buttons(const bContext *C, ARegion *ar) uiBlockEndAlign(block); - xco+=XIC; - uiDefButI(block, NUM, B_NEWFRAME, "", (xco+20),yco,60,YIC, &(CTX_data_scene(C)->r.cfra), MINAFRAMEF, MAXFRAMEF, 0, 0, "Displays Current Frame of animation. Click to change."); - xco+= 80; - /* always as last */ UI_view2d_totRect_set(&ar->v2d, xco+XIC+80, ar->v2d.tot.ymax-ar->v2d.tot.ymin); |