diff options
author | Joshua Leung <aligorith@gmail.com> | 2009-05-09 06:37:12 +0400 |
---|---|---|
committer | Joshua Leung <aligorith@gmail.com> | 2009-05-09 06:37:12 +0400 |
commit | 029c27b0bed239cfc9b27b6ef92bcd3d87bcfd1b (patch) | |
tree | db4c07d66a0564e8ec4864f04db15547649a2bb5 /source/blender/editors/animation/anim_markers.c | |
parent | 5fa80e74a1d18ca8798b2b42f6b4ecc09787ba30 (diff) |
2.5 Bugfixes:
More work on getting these marker-dependent tools working. They should finally work now :)
Diffstat (limited to 'source/blender/editors/animation/anim_markers.c')
-rw-r--r-- | source/blender/editors/animation/anim_markers.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/source/blender/editors/animation/anim_markers.c b/source/blender/editors/animation/anim_markers.c index 3848eef3608..2abec6b831c 100644 --- a/source/blender/editors/animation/anim_markers.c +++ b/source/blender/editors/animation/anim_markers.c @@ -119,6 +119,7 @@ void ED_markers_get_minmax (ListBase *markers, short sel, float *first, float *l int selcount = 0; /* sanity check */ + printf("markers = %p - %p, %p \n", markers, markers->first, markers->last); if (markers == NULL) { *first = 0.0f; *last = 0.0f; @@ -126,11 +127,11 @@ void ED_markers_get_minmax (ListBase *markers, short sel, float *first, float *l } if (markers->first && markers->last) { - TimeMarker *first= markers->first; - TimeMarker *last= markers->last; + TimeMarker *fm= markers->first; + TimeMarker *lm= markers->last; - min= first->frame; - max= last->frame; + min= (float)fm->frame; + max= (float)lm->frame; } else { *first = 0.0f; @@ -157,15 +158,15 @@ void ED_markers_get_minmax (ListBase *markers, short sel, float *first, float *l if (marker->flag & SELECT) { if (marker->frame < min) min= (float)marker->frame; - else if (marker->frame > max) + if (marker->frame > max) max= (float)marker->frame; } } else { if (marker->frame < min) - min= marker->frame; - else if (marker->frame > max) - max= marker->frame; + min= (float)marker->frame; + if (marker->frame > max) + max= (float)marker->frame; } } } |