diff options
| author | Joshua Leung <aligorith@gmail.com> | 2009-07-03 05:57:38 +0400 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2009-07-03 05:57:38 +0400 |
| commit | 5e92ddece3a7367ca7687e762226d639389e5517 (patch) | |
| tree | ba8437a82874057138ff5e9f07b446fa6d2ff044 /source/blender/editors/animation | |
| parent | 28d371d1178642e17f5dfc300f1500a132ce7149 (diff) | |
| parent | fb5f9273eba4b30e1aa0573388367592b18bdbba (diff) | |
NLA SoC: Merge from 2.5
21301 to 21329
Diffstat (limited to 'source/blender/editors/animation')
| -rw-r--r-- | source/blender/editors/animation/anim_draw.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/animation/anim_markers.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/animation/anim_draw.c b/source/blender/editors/animation/anim_draw.c index f7702379645..6c39e670f5c 100644 --- a/source/blender/editors/animation/anim_draw.c +++ b/source/blender/editors/animation/anim_draw.c @@ -167,7 +167,7 @@ void ANIM_draw_cfra (const bContext *C, View2D *v2d, short flag) glLineWidth(2.0); glBegin(GL_LINE_STRIP); - vec[1]= v2d->cur.ymin; + vec[1]= v2d->cur.ymin-500.0f; /* XXX arbitrary... want it go to bottom */ glVertex2fv(vec); vec[1]= v2d->cur.ymax; diff --git a/source/blender/editors/animation/anim_markers.c b/source/blender/editors/animation/anim_markers.c index 2abec6b831c..d6543b41f47 100644 --- a/source/blender/editors/animation/anim_markers.c +++ b/source/blender/editors/animation/anim_markers.c @@ -976,7 +976,7 @@ static void MARKER_OT_delete(wmOperatorType *ot) /* ************************** registration **********************************/ /* called in screen_ops.c:ED_operatortypes_screen() */ -void ED_marker_operatortypes(void) +void ED_operatortypes_marker(void) { WM_operatortype_append(MARKER_OT_add); WM_operatortype_append(MARKER_OT_move); |