diff options
| author | Joerg Mueller <nexyon@gmail.com> | 2011-08-30 12:22:03 +0400 |
|---|---|---|
| committer | Joerg Mueller <nexyon@gmail.com> | 2011-08-30 12:22:03 +0400 |
| commit | 43ab8e86247b7889d16d915b4f370ceb618aaad4 (patch) | |
| tree | 64b1fec1adcc399eb1de5cd86ebafd753a921d8d /source/blender/editors/space_sequencer/sequencer_intern.h | |
| parent | 5b5e600db6f529ad7e1af9d4bb3a193be2265342 (diff) | |
| parent | d049a722fea3d150fbfad06ffdbbb5c150717134 (diff) | |
* Merge trunk up to r39790.soc-2011-pepper
* Subversion bump (also for init_userdef_do_versions).
* Minor fix for compilation without ffmpeg.
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, 2 insertions, 0 deletions
diff --git a/source/blender/editors/space_sequencer/sequencer_intern.h b/source/blender/editors/space_sequencer/sequencer_intern.h index 7ab76f9b6d7..89e9a22c9a1 100644 --- a/source/blender/editors/space_sequencer/sequencer_intern.h +++ b/source/blender/editors/space_sequencer/sequencer_intern.h @@ -118,6 +118,8 @@ void SEQUENCER_OT_change_path(struct wmOperatorType *ot); void SEQUENCER_OT_copy(struct wmOperatorType *ot); void SEQUENCER_OT_paste(struct wmOperatorType *ot); +void SEQUENCER_OT_rebuild_proxy(struct wmOperatorType *ot); + /* preview specific operators */ void SEQUENCER_OT_view_all_preview(struct wmOperatorType *ot); |