diff options
| author | Ton Roosendaal <ton@blender.org> | 2007-12-29 19:12:35 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2007-12-29 19:12:35 +0300 |
| commit | 97f144b5ff2ec803b67d6aa2065cd7240e7c6e99 (patch) | |
| tree | 78fe41ffbb7560c179ad21598f4855703279c8bc /source/blender/blenkernel/intern/image.c | |
| parent | 878e09396e74f14c73bd1e97b01d5406b17ed858 (diff) | |
And now blender will link again! However, with a bad stub.c
That's going to be tackled.
Diffstat (limited to 'source/blender/blenkernel/intern/image.c')
| -rw-r--r-- | source/blender/blenkernel/intern/image.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c index 31323e003bd..6b0586ab62c 100644 --- a/source/blender/blenkernel/intern/image.c +++ b/source/blender/blenkernel/intern/image.c @@ -81,8 +81,6 @@ /* for stamp drawing to an image */ #include "BMF_Api.h" -#include "blendef.h" -#include "BSE_time.h" #include "BDR_drawmesh.h" /* max int, to indicate we don't store sequences in ibuf */ @@ -833,7 +831,7 @@ static void stampdata(StampData *stamp_data, int do_prefix) } if (G.scene->r.stamp & R_STAMP_MARKER) { - TimeMarker *marker = get_frame_marker(CFRA); + TimeMarker *marker = NULL; // XXX get_frame_marker(G.scene->r.cfra); if (marker) strcpy(text, marker->name); else strcpy(text, "<none>"); @@ -895,7 +893,7 @@ static void stampdata(StampData *stamp_data, int do_prefix) } if (G.scene->r.stamp & R_STAMP_SEQSTRIP) { - Sequence *seq = get_forground_frame_seq(CFRA); + Sequence *seq = get_forground_frame_seq(G.scene->r.cfra); if (seq) strcpy(text, seq->name+2); else strcpy(text, "<none>"); |