[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26659] trunk/blender/source/blender/ blenkernel/intern/scene.c: Fix for stamp marker name lookup, was returning wrong incorrect pointer.

[Brecht Van Lommel]

Revision: 26659
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26659
Author:   blendix
Date:     2010-02-07 10:52:43 +0100 (Sun, 07 Feb 2010)

Log Message:
-----------
Fix for stamp marker name lookup, was returning wrong incorrect pointer.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/scene.c

Modified: trunk/blender/source/blender/blenkernel/intern/scene.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/scene.c      2010-02-07 
04:38:45 UTC (rev 26658)
+++ trunk/blender/source/blender/blenkernel/intern/scene.c      2010-02-07 
09:52:43 UTC (rev 26659)
@@ -760,7 +760,7 @@
        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) {


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs