Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2010-02-07 12:52:43 +0300
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2010-02-07 12:52:43 +0300
commit64d9026144ffed025c9a5490a66e4a651dac8866 (patch)
treefebb6c789f27b56aa20e664b327cc40350ae883b /source/blender/blenkernel/intern/scene.c
parent447e4efaac08d64f91f77d62cc071db636f6a099 (diff)
Fix for stamp marker name lookup, was returning wrong incorrect pointer.
Diffstat (limited to 'source/blender/blenkernel/intern/scene.c')
-rw-r--r--source/blender/blenkernel/intern/scene.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index 83663637f97..b80f22a05c2 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -760,7 +760,7 @@ char *scene_find_last_marker_name(Scene *scene, int frame)
int best_frame = -MAXFRAME*2;
for (marker= scene->markers.first; marker; marker= marker->next) {
if (marker->frame==frame) {
- return marker;
+ return marker->name;
}
if ( marker->frame > best_frame && marker->frame < frame) {