diff options
author | Campbell Barton <ideasman42@gmail.com> | 2010-02-06 17:56:25 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2010-02-06 17:56:25 +0300 |
commit | bd0b26f7bbb9679d54d661349adc8dd6e7b138b9 (patch) | |
tree | 31c40344111dca34372ba9aa80872ae2caf3d625 /source/blender/editors/space_view3d/view3d_draw.c | |
parent | eafdf42c24b2555ec97bbbb471091bc280e6759a (diff) |
bugfix [#20990] maker name don't show in render stamp
Diffstat (limited to 'source/blender/editors/space_view3d/view3d_draw.c')
-rw-r--r-- | source/blender/editors/space_view3d/view3d_draw.c | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c index 067098312ff..c33f8723231 100644 --- a/source/blender/editors/space_view3d/view3d_draw.c +++ b/source/blender/editors/space_view3d/view3d_draw.c @@ -755,27 +755,6 @@ static void draw_viewport_name(ARegion *ar, View3D *v3d) } } - -static char *get_cfra_marker_name(Scene *scene) -{ - ListBase *markers= &scene->markers; - TimeMarker *m1, *m2; - - /* search through markers for match */ - for (m1=markers->first, m2=markers->last; m1 && m2; m1=m1->next, m2=m2->prev) { - if (m1->frame==CFRA) - return m1->name; - - if (m1 == m2) - break; - - if (m2->frame==CFRA) - return m2->name; - } - - return NULL; -} - /* draw info beside axes in bottom left-corner: * framenum, object name, bone name (if available), marker name (if available) */ @@ -785,7 +764,7 @@ static void draw_selected_name(Scene *scene, Object *ob, View3D *v3d) short offset=30; /* get name of marker on current frame (if available) */ - markern= get_cfra_marker_name(scene); + markern= scene_find_marker_name(scene, CFRA); /* check if there is an object */ if(ob) { |