diff options
Diffstat (limited to 'source/blender/blenkernel/intern/image.c')
-rw-r--r-- | source/blender/blenkernel/intern/image.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c index d5166fc7a83..de1747e514c 100644 --- a/source/blender/blenkernel/intern/image.c +++ b/source/blender/blenkernel/intern/image.c @@ -55,6 +55,7 @@ #include "DNA_camera_types.h" #include "DNA_sequence_types.h" #include "DNA_texture_types.h" +#include "DNA_sequence_types.h" #include "DNA_userdef_types.h" #include "BLI_arithb.h" @@ -72,7 +73,7 @@ #include "BKE_texture.h" #include "BKE_utildefines.h" -#include "BIF_editseq.h" +//XXX #include "BIF_editseq.h" #include "PIL_time.h" @@ -81,9 +82,6 @@ /* for stamp drawing to an image */ #include "BMF_Api.h" -#include "blendef.h" -#include "BSE_time.h" - #include "GPU_extensions.h" #include "GPU_draw.h" @@ -945,7 +943,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>"); @@ -1010,7 +1008,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; //XXX = get_forground_frame_seq(G.scene->r.cfra); if (seq) strcpy(text, seq->name+2); else strcpy(text, "<none>"); |