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/blenkernel/intern/image.c | |
| parent | eafdf42c24b2555ec97bbbb471091bc280e6759a (diff) | |
bugfix [#20990] maker name don't show in render stamp
Diffstat (limited to 'source/blender/blenkernel/intern/image.c')
| -rw-r--r-- | source/blender/blenkernel/intern/image.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c index a05e8516260..6280fb27430 100644 --- a/source/blender/blenkernel/intern/image.c +++ b/source/blender/blenkernel/intern/image.c @@ -1011,9 +1011,9 @@ static void stampdata(Scene *scene, StampData *stamp_data, int do_prefix) } if (scene->r.stamp & R_STAMP_MARKER) { - TimeMarker *marker = NULL; // XXX get_frame_marker(scene->r.cfra); + char *name = scene_find_last_marker_name(scene, CFRA); - if (marker) strcpy(text, marker->name); + if (name) strcpy(text, name); else strcpy(text, "<none>"); if (do_prefix) sprintf(stamp_data->marker, "Marker %s", text); |