diff options
| author | Miika Hamalainen <blender@miikah.org> | 2012-08-27 14:59:15 +0400 |
|---|---|---|
| committer | Miika Hamalainen <blender@miikah.org> | 2012-08-27 14:59:15 +0400 |
| commit | b3f311784d6c356eac2ff46e796d4a39cfc935c8 (patch) | |
| tree | fe1a81243b21f16339373a8ebfff5e6daa7af3d6 /source/blender/editors/space_sequencer/sequencer_intern.h | |
| parent | e777ee95f03e98d9842d47c173363b252e9663e9 (diff) | |
| parent | 13254cde8c7ca38af2dcec35efdb9f8f9b3bca46 (diff) | |
Merge with trunk r50245 + fixed issues caused by previous (failed?) merge.
Diffstat (limited to 'source/blender/editors/space_sequencer/sequencer_intern.h')
| -rw-r--r-- | source/blender/editors/space_sequencer/sequencer_intern.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/space_sequencer/sequencer_intern.h b/source/blender/editors/space_sequencer/sequencer_intern.h index 81ee9927cb6..f5c3a4c4d89 100644 --- a/source/blender/editors/space_sequencer/sequencer_intern.h +++ b/source/blender/editors/space_sequencer/sequencer_intern.h @@ -52,7 +52,7 @@ struct ARegion *sequencer_has_buttons_region(struct ScrArea *sa); /* sequencer_draw.c */ void draw_timeline_seq(const struct bContext *C, struct ARegion *ar); -void draw_image_seq(const struct bContext* C, struct Scene *scene, struct ARegion *ar, struct SpaceSeq *sseq, int cfra, int offset, int draw_overlay); +void draw_image_seq(const struct bContext *C, struct Scene *scene, struct ARegion *ar, struct SpaceSeq *sseq, int cfra, int offset, int draw_overlay); void seq_reset_imageofs(struct SpaceSeq *sseq); |